Skip to content

Commit 6d36e5f

Browse files
xiaopeng12138xiaopeng12138
committed
update readme and better light map
1 parent d44a2b6 commit 6d36e5f

17 files changed

+398
-40
lines changed

‎Assets/DefaultLighting.lighting‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ LightingSettings:
1818
m_UsingShadowmask: 0
1919
m_BakeBackend: 2
2020
m_LightmapMaxSize: 1024
21-
m_BakeResolution: 140
21+
m_BakeResolution: 192
2222
m_Padding: 2
2323
m_LightmapCompression: 2
2424
m_AO: 0
@@ -40,13 +40,13 @@ LightingSettings:
4040
m_FinalGatherFiltering: 1
4141
m_PVRCulling: 1
4242
m_PVRSampling: 1
43-
m_PVRDirectSampleCount: 64
44-
m_PVRSampleCount: 128
43+
m_PVRDirectSampleCount: 256
44+
m_PVRSampleCount: 512
4545
m_PVREnvironmentSampleCount: 8
4646
m_PVREnvironmentReferencePointCount: 2048
4747
m_LightProbeSampleCountMultiplier: 4
48-
m_PVRBounces: 5
49-
m_PVRMinBounces: 1
48+
m_PVRBounces: 8
49+
m_PVRMinBounces: 2
5050
m_PVREnvironmentMIS: 0
5151
m_PVRFilteringMode: 2
5252
m_PVRDenoiserTypeDirect: 1

‎Assets/Materials/Floor.mat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Material:
3939
m_TexEnvs:
4040
- _BaseMap:
4141
m_Texture: {fileID: 2800000, guid: 32fa26fa0c3961d4ea3c27cc6e8cde7e, type: 3}
42-
m_Scale: {x: 5, y: 5}
42+
m_Scale: {x: 10, y: 10}
4343
m_Offset: {x: 0, y: 0}
4444
- _BumpMap:
4545
m_Texture: {fileID: 2800000, guid: 02dcd20f531722044bf4a3603dc3cc8e, type: 3}
@@ -63,7 +63,7 @@ Material:
6363
m_Offset: {x: 0, y: 0}
6464
- _MainTex:
6565
m_Texture: {fileID: 2800000, guid: 32fa26fa0c3961d4ea3c27cc6e8cde7e, type: 3}
66-
m_Scale: {x: 5, y: 5}
66+
m_Scale: {x: 10, y: 10}
6767
m_Offset: {x: 0, y: 0}
6868
- _MetallicGlossMap:
6969
m_Texture: {fileID: 0}

‎Assets/Scenes/MainScene.unity‎

Lines changed: 107 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7061,6 +7061,11 @@ PrefabInstance:
70617061
propertyPath: m_StaticEditorFlags
70627062
value: 2147483647
70637063
objectReference: {fileID: 0}
7064+
- target: {fileID: -9128090238604022076, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
7065+
type: 3}
7066+
propertyPath: m_ScaleInLightmap
7067+
value: 3
7068+
objectReference: {fileID: 0}
70647069
- target: {fileID: -8980045776078546229, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
70657070
type: 3}
70667071
propertyPath: m_Enabled
@@ -7226,6 +7231,11 @@ PrefabInstance:
72267231
propertyPath: m_CastShadows
72277232
value: 1
72287233
objectReference: {fileID: 0}
7234+
- target: {fileID: -7857521847107774905, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
7235+
type: 3}
7236+
propertyPath: m_ScaleInLightmap
7237+
value: 1.25
7238+
objectReference: {fileID: 0}
72297239
- target: {fileID: -7857521847107774905, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
72307240
type: 3}
72317241
propertyPath: m_StitchLightmapSeams
@@ -7381,6 +7391,16 @@ PrefabInstance:
73817391
propertyPath: m_StaticEditorFlags
73827392
value: 2147483647
73837393
objectReference: {fileID: 0}
7394+
- target: {fileID: -5342259654076704066, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
7395+
type: 3}
7396+
propertyPath: m_ReceiveGI
7397+
value: 2
7398+
objectReference: {fileID: 0}
7399+
- target: {fileID: -5342259654076704066, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
7400+
type: 3}
7401+
propertyPath: m_CastShadows
7402+
value: 0
7403+
objectReference: {fileID: 0}
73847404
- target: {fileID: -5342259654076704066, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
73857405
type: 3}
73867406
propertyPath: m_Materials.Array.data[0]
@@ -7581,11 +7601,21 @@ PrefabInstance:
75817601
propertyPath: m_StaticEditorFlags
75827602
value: 1
75837603
objectReference: {fileID: 0}
7604+
- target: {fileID: -2859109400176981367, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
7605+
type: 3}
7606+
propertyPath: m_ScaleInLightmap
7607+
value: 0.1
7608+
objectReference: {fileID: 0}
75847609
- target: {fileID: -2770825260674409808, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
75857610
type: 3}
75867611
propertyPath: m_StaticEditorFlags
75877612
value: 2147483647
75887613
objectReference: {fileID: 0}
7614+
- target: {fileID: -2724932512259047546, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
7615+
type: 3}
7616+
propertyPath: m_ScaleInLightmap
7617+
value: 3
7618+
objectReference: {fileID: 0}
75897619
- target: {fileID: -2686133645533411133, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
75907620
type: 3}
75917621
propertyPath: m_StaticEditorFlags
@@ -7686,6 +7716,11 @@ PrefabInstance:
76867716
propertyPath: m_StaticEditorFlags
76877717
value: 0
76887718
objectReference: {fileID: 0}
7719+
- target: {fileID: -1909195428182568538, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
7720+
type: 3}
7721+
propertyPath: m_ScaleInLightmap
7722+
value: 0.1
7723+
objectReference: {fileID: 0}
76897724
- target: {fileID: -1827027357054264037, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
76907725
type: 3}
76917726
propertyPath: m_StaticEditorFlags
@@ -7771,6 +7806,26 @@ PrefabInstance:
77717806
propertyPath: m_LocalPosition.z
77727807
value: 0.07
77737808
objectReference: {fileID: 0}
7809+
- target: {fileID: -717511211058055674, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
7810+
type: 3}
7811+
propertyPath: m_LocalRotation.w
7812+
value: 0.57286143
7813+
objectReference: {fileID: 0}
7814+
- target: {fileID: -717511211058055674, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
7815+
type: 3}
7816+
propertyPath: m_LocalRotation.x
7817+
value: -0.8196523
7818+
objectReference: {fileID: 0}
7819+
- target: {fileID: -717511211058055674, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
7820+
type: 3}
7821+
propertyPath: m_LocalRotation.z
7822+
value: 0
7823+
objectReference: {fileID: 0}
7824+
- target: {fileID: -717511211058055674, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
7825+
type: 3}
7826+
propertyPath: m_LocalEulerAnglesHint.x
7827+
value: -110.1
7828+
objectReference: {fileID: 0}
77747829
- target: {fileID: -380595139111555720, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
77757830
type: 3}
77767831
propertyPath: m_StaticEditorFlags
@@ -7839,12 +7894,32 @@ PrefabInstance:
78397894
- target: {fileID: 795547410136657018, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
78407895
type: 3}
78417896
propertyPath: m_LocalPosition.y
7842-
value: 1.4265
7897+
value: 1.4279
78437898
objectReference: {fileID: 0}
78447899
- target: {fileID: 795547410136657018, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
78457900
type: 3}
78467901
propertyPath: m_LocalPosition.z
7847-
value: 0.0696
7902+
value: 0.0691
7903+
objectReference: {fileID: 0}
7904+
- target: {fileID: 795547410136657018, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
7905+
type: 3}
7906+
propertyPath: m_LocalRotation.w
7907+
value: 0.57286143
7908+
objectReference: {fileID: 0}
7909+
- target: {fileID: 795547410136657018, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
7910+
type: 3}
7911+
propertyPath: m_LocalRotation.x
7912+
value: -0.8196523
7913+
objectReference: {fileID: 0}
7914+
- target: {fileID: 795547410136657018, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
7915+
type: 3}
7916+
propertyPath: m_LocalRotation.z
7917+
value: 0
7918+
objectReference: {fileID: 0}
7919+
- target: {fileID: 795547410136657018, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
7920+
type: 3}
7921+
propertyPath: m_LocalEulerAnglesHint.x
7922+
value: -110.1
78487923
objectReference: {fileID: 0}
78497924
- target: {fileID: 850468428025529609, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
78507925
type: 3}
@@ -7919,7 +7994,7 @@ PrefabInstance:
79197994
- target: {fileID: 1995990277796536632, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
79207995
type: 3}
79217996
propertyPath: m_StaticEditorFlags
7922-
value: 0
7997+
value: 1
79237998
objectReference: {fileID: 0}
79247999
- target: {fileID: 2009740602367058978, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
79258000
type: 3}
@@ -7951,6 +8026,11 @@ PrefabInstance:
79518026
propertyPath: m_Enabled
79528027
value: 0
79538028
objectReference: {fileID: 0}
8029+
- target: {fileID: 2438565304415241699, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
8030+
type: 3}
8031+
propertyPath: m_ScaleInLightmap
8032+
value: 3
8033+
objectReference: {fileID: 0}
79548034
- target: {fileID: 2466260003292395435, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
79558035
type: 3}
79568036
propertyPath: m_Enabled
@@ -8251,6 +8331,11 @@ PrefabInstance:
82518331
propertyPath: m_StaticEditorFlags
82528332
value: 2147483647
82538333
objectReference: {fileID: 0}
8334+
- target: {fileID: 4484653850034527598, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
8335+
type: 3}
8336+
propertyPath: m_ReceiveGI
8337+
value: 2
8338+
objectReference: {fileID: 0}
82548339
- target: {fileID: 4484653850034527598, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
82558340
type: 3}
82568341
propertyPath: m_CastShadows
@@ -8656,6 +8741,11 @@ PrefabInstance:
86568741
propertyPath: m_TagString
86578742
value: DisplayP2
86588743
objectReference: {fileID: 0}
8744+
- target: {fileID: 8110296352969589220, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
8745+
type: 3}
8746+
propertyPath: m_StaticEditorFlags
8747+
value: 1
8748+
objectReference: {fileID: 0}
86598749
- target: {fileID: 8123848027915441045, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
86608750
type: 3}
86618751
propertyPath: m_Name
@@ -8671,6 +8761,11 @@ PrefabInstance:
86718761
propertyPath: m_StaticEditorFlags
86728762
value: 2147483647
86738763
objectReference: {fileID: 0}
8764+
- target: {fileID: 8659595510093492236, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
8765+
type: 3}
8766+
propertyPath: m_ScaleInLightmap
8767+
value: 0.25
8768+
objectReference: {fileID: 0}
86748769
- target: {fileID: 8722154295087679164, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5,
86758770
type: 3}
86768771
propertyPath: m_StaticEditorFlags
@@ -15065,7 +15160,7 @@ PrefabInstance:
1506515160
- target: {fileID: -6635190872123795447, guid: 4557494e9d4b8ab47b2842d4bf045f25,
1506615161
type: 3}
1506715162
propertyPath: m_ScaleInLightmap
15068-
value: 0.5
15163+
value: 0.1
1506915164
objectReference: {fileID: 0}
1507015165
- target: {fileID: -3816740887767321414, guid: 4557494e9d4b8ab47b2842d4bf045f25,
1507115166
type: 3}
@@ -15125,12 +15220,12 @@ PrefabInstance:
1512515220
- target: {fileID: -1596442841338162665, guid: 4557494e9d4b8ab47b2842d4bf045f25,
1512615221
type: 3}
1512715222
propertyPath: m_ScaleInLightmap
15128-
value: 0.5
15223+
value: 0.25
1512915224
objectReference: {fileID: 0}
1513015225
- target: {fileID: -1342902887879466839, guid: 4557494e9d4b8ab47b2842d4bf045f25,
1513115226
type: 3}
1513215227
propertyPath: m_ScaleInLightmap
15133-
value: 0.5
15228+
value: 0.25
1513415229
objectReference: {fileID: 0}
1513515230
- target: {fileID: -844778927340311124, guid: 4557494e9d4b8ab47b2842d4bf045f25,
1513615231
type: 3}
@@ -15175,7 +15270,7 @@ PrefabInstance:
1517515270
- target: {fileID: 2511811754567536238, guid: 4557494e9d4b8ab47b2842d4bf045f25,
1517615271
type: 3}
1517715272
propertyPath: m_ScaleInLightmap
15178-
value: 0.5
15273+
value: 0.25
1517915274
objectReference: {fileID: 0}
1518015275
- target: {fileID: 2550463727306718371, guid: 4557494e9d4b8ab47b2842d4bf045f25,
1518115276
type: 3}
@@ -15250,12 +15345,12 @@ PrefabInstance:
1525015345
- target: {fileID: 8247994413960396516, guid: 4557494e9d4b8ab47b2842d4bf045f25,
1525115346
type: 3}
1525215347
propertyPath: m_ScaleInLightmap
15253-
value: 0.5
15348+
value: 0.25
1525415349
objectReference: {fileID: 0}
1525515350
- target: {fileID: 8537421735129595006, guid: 4557494e9d4b8ab47b2842d4bf045f25,
1525615351
type: 3}
1525715352
propertyPath: m_ScaleInLightmap
15258-
value: 0.5
15353+
value: 0.25
1525915354
objectReference: {fileID: 0}
1526015355
m_RemovedComponents: []
1526115356
m_SourcePrefab: {fileID: 100100000, guid: 4557494e9d4b8ab47b2842d4bf045f25, type: 3}
@@ -21382,6 +21477,7 @@ MonoBehaviour:
2138221477
m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
2138321478
m_Name:
2138421479
m_EditorClassIdentifier:
21480+
m_SendPointerHoverToParent: 1
2138521481
m_MoveRepeatDelay: 0.5
2138621482
m_MoveRepeatRate: 0.1
2138721483
m_XRTrackingOrigin: {fileID: 0}
@@ -21409,6 +21505,7 @@ MonoBehaviour:
2140921505
type: 3}
2141021506
m_DeselectOnBackgroundClick: 1
2141121507
m_PointerBehavior: 0
21508+
m_CursorLockBehavior: 0
2141221509
--- !u!114 &1793933670
2141321510
MonoBehaviour:
2141421511
m_ObjectHideFlags: 0
@@ -21421,6 +21518,7 @@ MonoBehaviour:
2142121518
m_Script: {fileID: 11500000, guid: ab68ce6587aab0146b8dabefbd806791, type: 3}
2142221519
m_Name:
2142321520
m_EditorClassIdentifier:
21521+
m_SendPointerHoverToParent: 1
2142421522
m_ClickSpeed: 0.3
2142521523
m_MoveDeadzone: 0.6
2142621524
m_RepeatDelay: 0.5

‎Assets/Scenes/MainScene/LightingData.asset‎

352 Bytes
Binary file not shown.

‎Assets/Scenes/MainScene/Lightmap-0_comp_dir.png‎

58.4 KB
Loading

‎Assets/Scenes/MainScene/Lightmap-0_comp_light.exr‎

-39.2 KB
Binary file not shown.

‎Assets/Scenes/MainScene/Lightmap-1_comp_dir.png‎

315 KB
Loading

0 commit comments

Comments
 (0)