Skip to content

Commit df742ac

Browse files
committed
Added light probes to prefabs
1 parent d70c826 commit df742ac

File tree

13 files changed

+495
-62
lines changed

13 files changed

+495
-62
lines changed

UOP1_Project/Assets/Prefabs/Lights/Sun_Directional_Sunset.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Light:
4343
m_Type: 1
4444
m_Shape: 0
4545
m_Color: {r: 1, g: 0.9490566, b: 0.8726415, a: 1}
46-
m_Intensity: 1
46+
m_Intensity: 0.8
4747
m_Range: 10
4848
m_SpotAngle: 30
4949
m_InnerSpotAngle: 21.80208

UOP1_Project/Assets/Prefabs/Nature/Grass2.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ LightProbeGroup:
4040
m_GameObject: {fileID: 4392763604800818938}
4141
m_Enabled: 1
4242
m_SourcePositions:
43-
- {x: 0, y: 0.2, z: 0}
43+
- {x: 0.000000012593722, y: 0.4310027, z: -0.000000016025615}
4444
m_Dering: 1
4545
--- !u!1001 &5337432841198777591
4646
PrefabInstance:

UOP1_Project/Assets/Prefabs/Nature/Trees/Tree.prefab

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ LightProbeGroup:
8585
m_Enabled: 1
8686
m_SourcePositions:
8787
- {x: 2.9505236, y: 2.1932707, z: 0.4321007}
88-
- {x: 1.7362281, y: -0.6262684, z: 0.6704607}
88+
- {x: 0.4898444, y: 0.088603735, z: 0.5064458}
8989
- {x: -2.4288023, y: 3.3489447, z: 1.6985066}
9090
- {x: -1.3478875, y: 2.227582, z: -3.29421}
91-
- {x: -1.7080367, y: -0.8651689, z: 1.1814008}
92-
- {x: -1.1097132, y: -0.34867764, z: -2.11101}
91+
- {x: -1.0502207, y: -0.15029693, z: 0.5931518}
92+
- {x: -0.69682753, y: -0.016775489, z: -1.2544638}
9393
m_Dering: 1
9494
--- !u!136 &4744890041706611347
9595
CapsuleCollider:

UOP1_Project/Assets/Prefabs/Nature/Trees/Tree3.prefab

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ LightProbeGroup:
9898
m_GameObject: {fileID: 5516909994212616272}
9999
m_Enabled: 1
100100
m_SourcePositions:
101-
- {x: 1.9370961, y: 1, z: -0.2501645}
102-
- {x: 1.2758579, y: -1.1107426, z: -0.7617769}
103-
- {x: -1.5494576, y: 0.99999994, z: 2.4017866}
104-
- {x: -0.66042644, y: 1.0000001, z: -2.0596814}
105-
- {x: 0.058872163, y: -1.1107426, z: 1.9835734}
106-
- {x: -1.6396918, y: -1.1107426, z: -1.0010338}
101+
- {x: 1.4182706, y: 1, z: -0.059854016}
102+
- {x: 0.8207936, y: -0.79627955, z: -0.3538483}
103+
- {x: -0.4087906, y: 1, z: 1.2589511}
104+
- {x: -1.261863, y: 1.044858, z: -0.74033725}
105+
- {x: 0.21436304, y: -0.87424, z: 0.7844776}
106+
- {x: -0.40194067, y: -1.0479484, z: -0.40193987}
107107
m_Dering: 1
108108
--- !u!1001 &2359711122858188467
109109
PrefabInstance:

UOP1_Project/Assets/Prefabs/Nature/Trees/Tree_Mushroom.prefab

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,52 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &3049526209703045695
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: 655848291289296771}
12+
- component: {fileID: 8543324722002667117}
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 &655848291289296771
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: 3049526209703045695}
27+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
28+
m_LocalPosition: {x: -0, y: 2.458, z: 0}
29+
m_LocalScale: {x: 1, y: 1, z: 1}
30+
m_Children: []
31+
m_Father: {fileID: 8271441551491845698}
32+
m_RootOrder: 1
33+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
34+
--- !u!220 &8543324722002667117
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: 3049526209703045695}
41+
m_Enabled: 1
42+
m_SourcePositions:
43+
- {x: -0.35247257, y: 1.0000005, z: 1.2200276}
44+
- {x: 0.7904948, y: 1.0000007, z: -0.51685196}
45+
- {x: 0.3240704, y: -0.93550205, z: 0.5496779}
46+
- {x: -0.09175351, y: -1.0000002, z: -0.84038883}
47+
- {x: -1.2663637, y: 1.0000002, z: -0.6625904}
48+
- {x: -0.955163, y: -0.99999976, z: 0.29237896}
49+
m_Dering: 1
350
--- !u!136 &40470853242200050
451
CapsuleCollider:
552
m_ObjectHideFlags: 0
@@ -13,7 +60,7 @@ CapsuleCollider:
1360
m_Radius: 0.31
1461
m_Height: 3.46
1562
m_Direction: 1
16-
m_Center: {x: 0, y: 1.26, z: 0}
63+
m_Center: {x: 0, y: 1.55, z: 0}
1764
--- !u!1 &9201311995933557795
1865
GameObject:
1966
m_ObjectHideFlags: 0
@@ -39,7 +86,7 @@ Transform:
3986
m_PrefabAsset: {fileID: 0}
4087
m_GameObject: {fileID: 9201311995933557795}
4188
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
42-
m_LocalPosition: {x: 0, y: 3.26, z: -0.05}
89+
m_LocalPosition: {x: -0, y: 5.19, z: -0.05}
4390
m_LocalScale: {x: 1, y: 1, z: 1}
4491
m_Children: []
4592
m_Father: {fileID: 8271441551491845698}
@@ -56,7 +103,7 @@ SphereCollider:
56103
m_IsTrigger: 0
57104
m_Enabled: 1
58105
serializedVersion: 2
59-
m_Radius: 2.09
106+
m_Radius: 2.82
60107
m_Center: {x: 0, y: 0, z: 0}
61108
--- !u!1001 &8448938963756820905
62109
PrefabInstance:

UOP1_Project/Assets/Prefabs/Nature/Trees/Tree_Swirl.prefab

Lines changed: 53 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Transform:
2525
m_PrefabAsset: {fileID: 0}
2626
m_GameObject: {fileID: 4056575592252912706}
2727
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
28-
m_LocalPosition: {x: 0.34, y: 1.99, z: -1.365}
28+
m_LocalPosition: {x: 0.21, y: 2.37, z: -1.53}
2929
m_LocalScale: {x: 1.346, y: 1.346, z: 1.346}
3030
m_Children: []
3131
m_Father: {fileID: 5915946319903924327}
@@ -41,8 +41,8 @@ CapsuleCollider:
4141
m_Material: {fileID: 0}
4242
m_IsTrigger: 0
4343
m_Enabled: 1
44-
m_Radius: 0.44
45-
m_Height: 1.18
44+
m_Radius: 0.7
45+
m_Height: 1.7
4646
m_Direction: 1
4747
m_Center: {x: 0, y: 0, z: 0}
4848
--- !u!1 &5859954024079497084
@@ -70,7 +70,7 @@ Transform:
7070
m_PrefabAsset: {fileID: 0}
7171
m_GameObject: {fileID: 5859954024079497084}
7272
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
73-
m_LocalPosition: {x: -0.43, y: 4.74, z: -0.24}
73+
m_LocalPosition: {x: 0.18, y: 4.74, z: 0.05}
7474
m_LocalScale: {x: 1, y: 1, z: 1}
7575
m_Children: []
7676
m_Father: {fileID: 5915946319903924327}
@@ -100,10 +100,57 @@ CapsuleCollider:
100100
m_Material: {fileID: 0}
101101
m_IsTrigger: 0
102102
m_Enabled: 1
103-
m_Radius: 0.16
103+
m_Radius: 0.33997324
104104
m_Height: 3.1
105105
m_Direction: 1
106-
m_Center: {x: -0, y: 1.22, z: 0}
106+
m_Center: {x: 0.06869978, y: 1.22, z: -0.129064}
107+
--- !u!1 &8004488151825470034
108+
GameObject:
109+
m_ObjectHideFlags: 0
110+
m_CorrespondingSourceObject: {fileID: 0}
111+
m_PrefabInstance: {fileID: 0}
112+
m_PrefabAsset: {fileID: 0}
113+
serializedVersion: 6
114+
m_Component:
115+
- component: {fileID: 5320092322122074936}
116+
- component: {fileID: 7689210839220268098}
117+
m_Layer: 0
118+
m_Name: Light Probe Group
119+
m_TagString: EditorOnly
120+
m_Icon: {fileID: 0}
121+
m_NavMeshLayer: 0
122+
m_StaticEditorFlags: 0
123+
m_IsActive: 1
124+
--- !u!4 &5320092322122074936
125+
Transform:
126+
m_ObjectHideFlags: 0
127+
m_CorrespondingSourceObject: {fileID: 0}
128+
m_PrefabInstance: {fileID: 0}
129+
m_PrefabAsset: {fileID: 0}
130+
m_GameObject: {fileID: 8004488151825470034}
131+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
132+
m_LocalPosition: {x: 0, y: 1.716, z: 0}
133+
m_LocalScale: {x: 1, y: 1, z: 1}
134+
m_Children: []
135+
m_Father: {fileID: 5915946319903924327}
136+
m_RootOrder: 2
137+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
138+
--- !u!220 &7689210839220268098
139+
LightProbeGroup:
140+
m_ObjectHideFlags: 0
141+
m_CorrespondingSourceObject: {fileID: 0}
142+
m_PrefabInstance: {fileID: 0}
143+
m_PrefabAsset: {fileID: 0}
144+
m_GameObject: {fileID: 8004488151825470034}
145+
m_Enabled: 1
146+
m_SourcePositions:
147+
- {x: 0.45437056, y: 1, z: 1.7472653}
148+
- {x: 1.8861067, y: 1, z: -1.1659493}
149+
- {x: 0.31241426, y: -0.32359314, z: 1.085271}
150+
- {x: 1.06547, y: -0.33247662, z: -0.48526067}
151+
- {x: -1, y: 1, z: -1}
152+
- {x: -0.35181463, y: -0.5212574, z: -0.27554333}
153+
m_Dering: 1
107154
--- !u!1001 &6166290628584556428
108155
PrefabInstance:
109156
m_ObjectHideFlags: 0

UOP1_Project/Assets/Prefabs/Props/Torch.prefab

Lines changed: 44 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,50 @@ MonoBehaviour:
6363
type: 2}
6464
_audioConfiguration: {fileID: 11400000, guid: 21f9d1bbfe816cd4a930533ced506b0f,
6565
type: 2}
66+
--- !u!1 &6580307017271216597
67+
GameObject:
68+
m_ObjectHideFlags: 0
69+
m_CorrespondingSourceObject: {fileID: 0}
70+
m_PrefabInstance: {fileID: 0}
71+
m_PrefabAsset: {fileID: 0}
72+
serializedVersion: 6
73+
m_Component:
74+
- component: {fileID: 2762693932476369790}
75+
- component: {fileID: 5797921276437449172}
76+
m_Layer: 0
77+
m_Name: Light Probe Group
78+
m_TagString: EditorOnly
79+
m_Icon: {fileID: 0}
80+
m_NavMeshLayer: 0
81+
m_StaticEditorFlags: 0
82+
m_IsActive: 1
83+
--- !u!4 &2762693932476369790
84+
Transform:
85+
m_ObjectHideFlags: 0
86+
m_CorrespondingSourceObject: {fileID: 0}
87+
m_PrefabInstance: {fileID: 0}
88+
m_PrefabAsset: {fileID: 0}
89+
m_GameObject: {fileID: 6580307017271216597}
90+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
91+
m_LocalPosition: {x: 0, y: 0, z: 0}
92+
m_LocalScale: {x: 1, y: 1, z: 1}
93+
m_Children: []
94+
m_Father: {fileID: 3639386882481120833}
95+
m_RootOrder: 4
96+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
97+
--- !u!220 &5797921276437449172
98+
LightProbeGroup:
99+
m_ObjectHideFlags: 0
100+
m_CorrespondingSourceObject: {fileID: 0}
101+
m_PrefabInstance: {fileID: 0}
102+
m_PrefabAsset: {fileID: 0}
103+
m_GameObject: {fileID: 6580307017271216597}
104+
m_Enabled: 1
105+
m_SourcePositions:
106+
- {x: -0.16974011, y: 0.93248296, z: -0.38005453}
107+
- {x: 0.30839422, y: 0.93248117, z: 0.1486516}
108+
- {x: -0.31543013, y: 0.93248296, z: 0.36063507}
109+
m_Dering: 1
66110
--- !u!1001 &945233447088500677
67111
PrefabInstance:
68112
m_ObjectHideFlags: 0
@@ -354,16 +398,6 @@ PrefabInstance:
354398
m_Modification:
355399
m_TransformParent: {fileID: 3639386882481120833}
356400
m_Modifications:
357-
- target: {fileID: 4734982731406355516, guid: f38545979646fbf42842e6c368a1f42e,
358-
type: 3}
359-
propertyPath: m_Range
360-
value: 3
361-
objectReference: {fileID: 0}
362-
- target: {fileID: 4734982731406355516, guid: f38545979646fbf42842e6c368a1f42e,
363-
type: 3}
364-
propertyPath: m_Intensity
365-
value: 1
366-
objectReference: {fileID: 0}
367401
- target: {fileID: 4734982731406355518, guid: f38545979646fbf42842e6c368a1f42e,
368402
type: 3}
369403
propertyPath: m_Name

UOP1_Project/Assets/Prefabs/TownStructures/BigTent.prefab

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,59 @@ Transform:
2929
m_Children:
3030
- {fileID: 3906775202268570525}
3131
- {fileID: 3906775201860032831}
32+
- {fileID: 9104886336788606131}
3233
m_Father: {fileID: 0}
3334
m_RootOrder: 0
3435
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
36+
--- !u!1 &8584998910707654905
37+
GameObject:
38+
m_ObjectHideFlags: 0
39+
m_CorrespondingSourceObject: {fileID: 0}
40+
m_PrefabInstance: {fileID: 0}
41+
m_PrefabAsset: {fileID: 0}
42+
serializedVersion: 6
43+
m_Component:
44+
- component: {fileID: 9104886336788606131}
45+
- component: {fileID: 7475110737971877434}
46+
m_Layer: 0
47+
m_Name: Light Probe Group
48+
m_TagString: EditorOnly
49+
m_Icon: {fileID: 0}
50+
m_NavMeshLayer: 0
51+
m_StaticEditorFlags: 0
52+
m_IsActive: 1
53+
--- !u!4 &9104886336788606131
54+
Transform:
55+
m_ObjectHideFlags: 0
56+
m_CorrespondingSourceObject: {fileID: 0}
57+
m_PrefabInstance: {fileID: 0}
58+
m_PrefabAsset: {fileID: 0}
59+
m_GameObject: {fileID: 8584998910707654905}
60+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
61+
m_LocalPosition: {x: -0, y: 2.07, z: 0}
62+
m_LocalScale: {x: 1, y: 1, z: 1}
63+
m_Children: []
64+
m_Father: {fileID: 6634204484256262969}
65+
m_RootOrder: 2
66+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
67+
--- !u!220 &7475110737971877434
68+
LightProbeGroup:
69+
m_ObjectHideFlags: 0
70+
m_CorrespondingSourceObject: {fileID: 0}
71+
m_PrefabInstance: {fileID: 0}
72+
m_PrefabAsset: {fileID: 0}
73+
m_GameObject: {fileID: 8584998910707654905}
74+
m_Enabled: 1
75+
m_SourcePositions:
76+
- {x: 0.05755769, y: 0.99999857, z: 0.19116396}
77+
- {x: 2.9600086, y: 0.99999976, z: 0.24141492}
78+
- {x: 2.3277843, y: -1.0000002, z: 2.6110961}
79+
- {x: 1.9884547, y: -1.0000004, z: -2.3926148}
80+
- {x: -1.1714928, y: 1, z: 2.5668418}
81+
- {x: -0.5778624, y: 1.0000002, z: -3.7484047}
82+
- {x: -3.440116, y: -0.99999976, z: 1.7302519}
83+
- {x: -4.1905384, y: -0.99999976, z: -1.9982532}
84+
m_Dering: 1
3585
--- !u!1001 &3584054025038365814
3686
PrefabInstance:
3787
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)