Skip to content

Commit 52246ec

Browse files
MinaPecheuxMinaPecheux
committed
refactor(assets): update scenes to use multi-scene workflow
1 parent 86bbba3 commit 52246ec

16 files changed

Lines changed: 1948 additions & 2933 deletions

‎Assets/Resources/Materials/Water.mat‎

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ Material:
2323
m_Texture: {fileID: 0}
2424
m_Scale: {x: 1, y: 1}
2525
m_Offset: {x: 0, y: 0}
26+
- _ColorControl:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
2630
- _DetailAlbedoMap:
2731
m_Texture: {fileID: 0}
2832
m_Scale: {x: 1, y: 1}
@@ -39,6 +43,18 @@ Material:
3943
m_Texture: {fileID: 0}
4044
m_Scale: {x: 1, y: 1}
4145
m_Offset: {x: 0, y: 0}
46+
- _Foam:
47+
m_Texture: {fileID: 0}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
50+
- _FoamGradient:
51+
m_Texture: {fileID: 0}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
54+
- _Fresnel:
55+
m_Texture: {fileID: 0}
56+
m_Scale: {x: 1, y: 1}
57+
m_Offset: {x: 0, y: 0}
4258
- _MainTex:
4359
m_Texture: {fileID: 0}
4460
m_Scale: {x: 1, y: 1}
@@ -55,24 +71,68 @@ Material:
5571
m_Texture: {fileID: 0}
5672
m_Scale: {x: 1, y: 1}
5773
m_Offset: {x: 0, y: 0}
74+
- _ReflectionTex:
75+
m_Texture: {fileID: 0}
76+
m_Scale: {x: 1, y: 1}
77+
m_Offset: {x: 0, y: 0}
78+
- _ReflectiveColor:
79+
m_Texture: {fileID: 0}
80+
m_Scale: {x: 1, y: 1}
81+
m_Offset: {x: 0, y: 0}
82+
- _RefractionTex:
83+
m_Texture: {fileID: 0}
84+
m_Scale: {x: 1, y: 1}
85+
m_Offset: {x: 0, y: 0}
86+
- _ShoreTex:
87+
m_Texture: {fileID: 0}
88+
m_Scale: {x: 1, y: 1}
89+
m_Offset: {x: 0, y: 0}
5890
m_Floats:
5991
- _BumpScale: 1
6092
- _Cutoff: 0.5
6193
- _DetailNormalMapScale: 1
6294
- _DstBlend: 0
95+
- _FoamStrength: 1
96+
- _FresnelScale: 0.75
97+
- _GerstnerIntensity: 1
6398
- _GlossMapScale: 1
6499
- _Glossiness: 1
65100
- _GlossyReflections: 1
66101
- _Metallic: 0.2
67102
- _Mode: 0
68103
- _OcclusionStrength: 1
69104
- _Parallax: 0.02
105+
- _ReflDistort: 0.44
106+
- _RefrDistort: 0.4
107+
- _Shininess: 200
70108
- _SmoothnessTextureChannel: 0
71109
- _SpecularHighlights: 1
72110
- _SrcBlend: 1
73111
- _UVSec: 0
112+
- _WaveScale: 0.063
74113
- _ZWrite: 1
75114
m_Colors:
76-
- _Color: {r: 0.13501245, g: 0.39105743, b: 0.6981132, a: 1}
115+
- WaveSpeed: {r: 19, g: 9, b: -16, a: -7}
116+
- _AnimationDirection: {r: 1, g: 1, b: 1, a: 1}
117+
- _AnimationTiling: {r: 2.2, g: 2.2, b: -1.1, a: -1.1}
118+
- _BaseColor: {r: 0.54, g: 0.95, b: 0.99, a: 0.5}
119+
- _BumpDirection: {r: 1, g: 1, b: -1, a: 1}
120+
- _BumpTiling: {r: 1, g: 1, b: -2, a: 3}
121+
- _Color: {r: 0.08098966, g: 0.26871213, b: 0.49056602, a: 1}
122+
- _DistortParams: {r: 1, g: 1, b: 2, a: 1.15}
77123
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
124+
- _Foam: {r: 0.1, g: 0.375, b: 0, a: 0}
125+
- _GAmplitude: {r: 0.3, g: 0.35, b: 0.25, a: 0.25}
126+
- _GDirectionAB: {r: 0.3, g: 0.85, b: 0.85, a: 0.25}
127+
- _GDirectionCD: {r: 0.1, g: 0.9, b: 0.5, a: 0.5}
128+
- _GFrequency: {r: 1.3, g: 1.35, b: 1.25, a: 1.25}
129+
- _GSpeed: {r: 1.2, g: 1.375, b: 1.1, a: 1.5}
130+
- _GSteepness: {r: 1, g: 1, b: 1, a: 1}
131+
- _HorizonColor: {r: 0.20185119, g: 0.48858604, b: 0.6792453, a: 1}
132+
- _InvFadeParemeter: {r: 0.15, g: 0.15, b: 0.5, a: 1}
133+
- _ReflectionColor: {r: 0.54, g: 0.95, b: 0.99, a: 0.5}
134+
- _RefrColor: {r: 0.56376827, g: 0.82938147, b: 0.9716981, a: 1}
135+
- _SpecularColor: {r: 0.72, g: 0.72, b: 0.72, a: 1}
136+
- _WorldLightDir: {r: 0, g: 0.1, b: -0.5, a: 0}
137+
- _horizonColor: {r: 0.172, g: 0.463, b: 0.435, a: 0}
78138
m_BuildTextureStacks: []

‎Assets/Resources/ScriptableObjects/Maps.meta‎

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

‎Assets/Resources/ScriptableObjects/Maps/Map1.asset‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: f58dab08efb344ee1b100084e8ea9b0d, type: 3}
13+
m_Name: Map1
14+
m_EditorClassIdentifier:
15+
mapName: The Hills
16+
mapSize: 200
17+
sceneName: Map1

‎Assets/Resources/ScriptableObjects/Maps/Map1.asset.meta‎

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

‎Assets/Scenes/Core.unity‎

Lines changed: 211 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,211 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!29 &1
4+
OcclusionCullingSettings:
5+
m_ObjectHideFlags: 0
6+
serializedVersion: 2
7+
m_OcclusionBakeSettings:
8+
smallestOccluder: 5
9+
smallestHole: 0.25
10+
backfaceThreshold: 100
11+
m_SceneGUID: 00000000000000000000000000000000
12+
m_OcclusionCullingData: {fileID: 0}
13+
--- !u!104 &2
14+
RenderSettings:
15+
m_ObjectHideFlags: 0
16+
serializedVersion: 9
17+
m_Fog: 0
18+
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
19+
m_FogMode: 3
20+
m_FogDensity: 0.01
21+
m_LinearFogStart: 0
22+
m_LinearFogEnd: 300
23+
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
24+
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
25+
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
26+
m_AmbientIntensity: 1
27+
m_AmbientMode: 0
28+
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
29+
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
30+
m_HaloStrength: 0.5
31+
m_FlareStrength: 1
32+
m_FlareFadeSpeed: 3
33+
m_HaloTexture: {fileID: 0}
34+
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
35+
m_DefaultReflectionMode: 0
36+
m_DefaultReflectionResolution: 128
37+
m_ReflectionBounces: 1
38+
m_ReflectionIntensity: 1
39+
m_CustomReflection: {fileID: 0}
40+
m_Sun: {fileID: 0}
41+
m_IndirectSpecularColor: {r: 0.3731193, g: 0.38073996, b: 0.3587269, a: 1}
42+
m_UseRadianceAmbientProbe: 0
43+
--- !u!157 &3
44+
LightmapSettings:
45+
m_ObjectHideFlags: 0
46+
serializedVersion: 12
47+
m_GIWorkflowMode: 1
48+
m_GISettings:
49+
serializedVersion: 2
50+
m_BounceScale: 1
51+
m_IndirectOutputScale: 1
52+
m_AlbedoBoost: 1
53+
m_EnvironmentLightingMode: 0
54+
m_EnableBakedLightmaps: 1
55+
m_EnableRealtimeLightmaps: 0
56+
m_LightmapEditorSettings:
57+
serializedVersion: 12
58+
m_Resolution: 2
59+
m_BakeResolution: 40
60+
m_AtlasSize: 1024
61+
m_AO: 0
62+
m_AOMaxDistance: 1
63+
m_CompAOExponent: 1
64+
m_CompAOExponentDirect: 0
65+
m_ExtractAmbientOcclusion: 0
66+
m_Padding: 2
67+
m_LightmapParameters: {fileID: 0}
68+
m_LightmapsBakeMode: 1
69+
m_TextureCompression: 1
70+
m_FinalGather: 0
71+
m_FinalGatherFiltering: 1
72+
m_FinalGatherRayCount: 256
73+
m_ReflectionCompression: 2
74+
m_MixedBakeMode: 2
75+
m_BakeBackend: 1
76+
m_PVRSampling: 1
77+
m_PVRDirectSampleCount: 32
78+
m_PVRSampleCount: 512
79+
m_PVRBounces: 2
80+
m_PVREnvironmentSampleCount: 256
81+
m_PVREnvironmentReferencePointCount: 2048
82+
m_PVRFilteringMode: 1
83+
m_PVRDenoiserTypeDirect: 1
84+
m_PVRDenoiserTypeIndirect: 1
85+
m_PVRDenoiserTypeAO: 1
86+
m_PVRFilterTypeDirect: 0
87+
m_PVRFilterTypeIndirect: 0
88+
m_PVRFilterTypeAO: 0
89+
m_PVREnvironmentMIS: 1
90+
m_PVRCulling: 1
91+
m_PVRFilteringGaussRadiusDirect: 1
92+
m_PVRFilteringGaussRadiusIndirect: 5
93+
m_PVRFilteringGaussRadiusAO: 2
94+
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
95+
m_PVRFilteringAtrousPositionSigmaIndirect: 2
96+
m_PVRFilteringAtrousPositionSigmaAO: 1
97+
m_ExportTrainingData: 0
98+
m_TrainingDataDestination: TrainingData
99+
m_LightProbeSampleCountMultiplier: 4
100+
m_LightingDataAsset: {fileID: 0}
101+
m_LightingSettings: {fileID: 0}
102+
--- !u!196 &4
103+
NavMeshSettings:
104+
serializedVersion: 2
105+
m_ObjectHideFlags: 0
106+
m_BuildSettings:
107+
serializedVersion: 2
108+
agentTypeID: 0
109+
agentRadius: 0.5
110+
agentHeight: 2
111+
agentSlope: 45
112+
agentClimb: 0.4
113+
ledgeDropHeight: 0
114+
maxJumpAcrossDistance: 0
115+
minRegionArea: 2
116+
manualCellSize: 0
117+
cellSize: 0.16666667
118+
manualTileSize: 0
119+
tileSize: 256
120+
accuratePlacement: 0
121+
maxJobWorkers: 0
122+
preserveTilesOutsideBounds: 0
123+
debug:
124+
m_Flags: 0
125+
m_NavMeshData: {fileID: 0}
126+
--- !u!1 &32012237
127+
GameObject:
128+
m_ObjectHideFlags: 0
129+
m_CorrespondingSourceObject: {fileID: 0}
130+
m_PrefabInstance: {fileID: 0}
131+
m_PrefabAsset: {fileID: 0}
132+
serializedVersion: 6
133+
m_Component:
134+
- component: {fileID: 32012238}
135+
- component: {fileID: 32012239}
136+
m_Layer: 0
137+
m_Name: DataHandler
138+
m_TagString: Untagged
139+
m_Icon: {fileID: 0}
140+
m_NavMeshLayer: 0
141+
m_StaticEditorFlags: 0
142+
m_IsActive: 1
143+
--- !u!4 &32012238
144+
Transform:
145+
m_ObjectHideFlags: 0
146+
m_CorrespondingSourceObject: {fileID: 0}
147+
m_PrefabInstance: {fileID: 0}
148+
m_PrefabAsset: {fileID: 0}
149+
m_GameObject: {fileID: 32012237}
150+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
151+
m_LocalPosition: {x: 0, y: 0, z: 0}
152+
m_LocalScale: {x: 1, y: 1, z: 1}
153+
m_Children: []
154+
m_Father: {fileID: 0}
155+
m_RootOrder: 1
156+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
157+
--- !u!114 &32012239
158+
MonoBehaviour:
159+
m_ObjectHideFlags: 0
160+
m_CorrespondingSourceObject: {fileID: 0}
161+
m_PrefabInstance: {fileID: 0}
162+
m_PrefabAsset: {fileID: 0}
163+
m_GameObject: {fileID: 32012237}
164+
m_Enabled: 1
165+
m_EditorHideFlags: 0
166+
m_Script: {fileID: 11500000, guid: 4b1293220f71f4ad59dd157eefa42dfd, type: 3}
167+
m_Name:
168+
m_EditorClassIdentifier:
169+
--- !u!1 &574271837
170+
GameObject:
171+
m_ObjectHideFlags: 0
172+
m_CorrespondingSourceObject: {fileID: 0}
173+
m_PrefabInstance: {fileID: 0}
174+
m_PrefabAsset: {fileID: 0}
175+
serializedVersion: 6
176+
m_Component:
177+
- component: {fileID: 574271838}
178+
- component: {fileID: 574271839}
179+
m_Layer: 0
180+
m_Name: Booter
181+
m_TagString: Untagged
182+
m_Icon: {fileID: 0}
183+
m_NavMeshLayer: 0
184+
m_StaticEditorFlags: 0
185+
m_IsActive: 1
186+
--- !u!4 &574271838
187+
Transform:
188+
m_ObjectHideFlags: 0
189+
m_CorrespondingSourceObject: {fileID: 0}
190+
m_PrefabInstance: {fileID: 0}
191+
m_PrefabAsset: {fileID: 0}
192+
m_GameObject: {fileID: 574271837}
193+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
194+
m_LocalPosition: {x: 0, y: 0, z: 0}
195+
m_LocalScale: {x: 1, y: 1, z: 1}
196+
m_Children: []
197+
m_Father: {fileID: 0}
198+
m_RootOrder: 0
199+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
200+
--- !u!114 &574271839
201+
MonoBehaviour:
202+
m_ObjectHideFlags: 0
203+
m_CorrespondingSourceObject: {fileID: 0}
204+
m_PrefabInstance: {fileID: 0}
205+
m_PrefabAsset: {fileID: 0}
206+
m_GameObject: {fileID: 574271837}
207+
m_Enabled: 1
208+
m_EditorHideFlags: 0
209+
m_Script: {fileID: 11500000, guid: 8e88161851c4b4b60890f0b79dccd828, type: 3}
210+
m_Name:
211+
m_EditorClassIdentifier:

‎Assets/Scenes/Core.unity.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.

Assets/Scenes/SampleScene.meta renamed to Assets/Scenes/GameScene.meta

File renamed without changes.

0 commit comments

Comments
 (0)