Skip to content

Commit 1fa9ff5

Browse files
committed
Removed ForestEntrance scene
1 parent d451378 commit 1fa9ff5

27 files changed

+2938
-9526
lines changed

UOP1_Project/Assets/AddressableAssetsData/AssetGroups/LocationScenes.asset

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ MonoBehaviour:
3333
m_Address: Assets/Scenes/Locations/Forest.unity
3434
m_ReadOnly: 0
3535
m_SerializedLabels: []
36-
- m_GUID: be5f0c750f94f8349baec06f6e495a3e
37-
m_Address: Assets/Scenes/Locations/Forest_Entrance.unity
38-
m_ReadOnly: 0
39-
m_SerializedLabels: []
4036
- m_GUID: e0e126273a41560478edee1d4da8e864
4137
m_Address: Assets/Scenes/Locations/Mountain_Path.unity
4238
m_ReadOnly: 0

UOP1_Project/Assets/Art/Props/Torch/Torch.mat

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,18 @@ Material:
2525
type: 3}
2626
m_ShaderKeywords:
2727
m_LightmapFlags: 4
28-
m_EnableInstancingVariants: 0
28+
m_EnableInstancingVariants: 1
2929
m_DoubleSidedGI: 0
3030
m_CustomRenderQueue: -1
3131
stringTagMap: {}
3232
disabledShaderPasses: []
3333
m_SavedProperties:
3434
serializedVersion: 3
3535
m_TexEnvs:
36+
- Texture2D_300EB541:
37+
m_Texture: {fileID: 0}
38+
m_Scale: {x: 1, y: 1}
39+
m_Offset: {x: 0, y: 0}
3640
- _BaseMap:
3741
m_Texture: {fileID: 0}
3842
m_Scale: {x: 1, y: 1}
@@ -69,7 +73,20 @@ Material:
6973
m_Texture: {fileID: 0}
7074
m_Scale: {x: 1, y: 1}
7175
m_Offset: {x: 0, y: 0}
76+
- unity_Lightmaps:
77+
m_Texture: {fileID: 0}
78+
m_Scale: {x: 1, y: 1}
79+
m_Offset: {x: 0, y: 0}
80+
- unity_LightmapsInd:
81+
m_Texture: {fileID: 0}
82+
m_Scale: {x: 1, y: 1}
83+
m_Offset: {x: 0, y: 0}
84+
- unity_ShadowMasks:
85+
m_Texture: {fileID: 0}
86+
m_Scale: {x: 1, y: 1}
87+
m_Offset: {x: 0, y: 0}
7288
m_Floats:
89+
- Vector1_8606F96E: 0
7390
- _AlphaClip: 0
7491
- _Blend: 0
7592
- _BumpScale: 1
@@ -104,3 +121,4 @@ Material:
104121
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
105122
- _SpecularColor: {r: 0, g: 0, b: 0, a: 0}
106123
- _Tiling: {r: 1, g: 1, b: 0, a: 0}
124+
m_BuildTextureStacks: []

UOP1_Project/Assets/Art/Props/WoodenBench/WoodenBench.mat

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ Material:
2020
m_SavedProperties:
2121
serializedVersion: 3
2222
m_TexEnvs:
23+
- Texture2D_300EB541:
24+
m_Texture: {fileID: 0}
25+
m_Scale: {x: 1, y: 1}
26+
m_Offset: {x: 0, y: 0}
2327
- _BaseMap:
2428
m_Texture: {fileID: 2800000, guid: f9222abb4aea72f41be8159a444c852f, type: 3}
2529
m_Scale: {x: 1, y: 1}
@@ -56,6 +60,18 @@ Material:
5660
m_Texture: {fileID: 0}
5761
m_Scale: {x: 1, y: 1}
5862
m_Offset: {x: 0, y: 0}
63+
- unity_Lightmaps:
64+
m_Texture: {fileID: 0}
65+
m_Scale: {x: 1, y: 1}
66+
m_Offset: {x: 0, y: 0}
67+
- unity_LightmapsInd:
68+
m_Texture: {fileID: 0}
69+
m_Scale: {x: 1, y: 1}
70+
m_Offset: {x: 0, y: 0}
71+
- unity_ShadowMasks:
72+
m_Texture: {fileID: 0}
73+
m_Scale: {x: 1, y: 1}
74+
m_Offset: {x: 0, y: 0}
5975
m_Floats:
6076
- Foam_Amount: 5
6177
- Foam_Cutoff: 3.5
@@ -72,6 +88,7 @@ Material:
7288
- Vector1_5BC4323: 8
7389
- Vector1_6B55B4E: 2
7490
- Vector1_77A997E: 0.5
91+
- Vector1_8606F96E: 0
7592
- Vector1_93E6CC20: 0
7693
- Vector1_A4EAD20D: 0.1
7794
- Vector1_CCBA7087: 0
@@ -124,12 +141,13 @@ Material:
124141
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
125142
- _Color: {r: 1, g: 1, b: 1, a: 1}
126143
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
127-
- _MainColor: {r: 1, g: 1, b: 1, a: 0}
144+
- _MainColor: {r: 0.8679245, g: 0.813472, b: 0.7497838, a: 0}
128145
- _MainTint: {r: 1, g: 1, b: 1, a: 0}
129146
- _Offset: {r: 0, g: 0, b: 0, a: 0}
130147
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
131148
- _SpecularColor: {r: 0, g: 0, b: 0, a: 0}
132149
- _Tiling: {r: 1, g: 1, b: 0, a: 0}
150+
m_BuildTextureStacks: []
133151
--- !u!114 &8633878897990286939
134152
MonoBehaviour:
135153
m_ObjectHideFlags: 11
Binary file not shown.

UOP1_Project/Assets/Art/Skybox/Captured/ForestEntrance_Cubemap.exr.meta

Lines changed: 0 additions & 108 deletions
This file was deleted.

UOP1_Project/Assets/Art/Skybox/Captured/Materials/ForestEntrance_Sky.mat

Lines changed: 0 additions & 121 deletions
This file was deleted.

UOP1_Project/Assets/Art/Skybox/Captured/Materials/ForestEntrance_Sky.mat.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)