Skip to content

Commit 887466c

Browse files
amel-unityamel-unity
committed
Merge remote-tracking branch 'origin/main' into main
2 parents 43afea8 + 9cfd324 commit 887466c

File tree

1,023 files changed

+71661
-109071
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,023 files changed

+71661
-109071
lines changed

‎UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache.meta renamed to ‎UOP1_Project/Assets/Art/Effects/CookingSteam.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UOP1_Project/Assets/Art/Effects/CookingSteam/CookingSteam.mat

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: CookingSteam
11+
m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3}
12+
m_ShaderKeywords: _FADING_ON _SOFTPARTICLES_ON
13+
m_LightmapFlags: 4
14+
m_EnableInstancingVariants: 0
15+
m_DoubleSidedGI: 0
16+
m_CustomRenderQueue: 3000
17+
stringTagMap:
18+
RenderType: Transparent
19+
disabledShaderPasses:
20+
- SHADOWCASTER
21+
m_SavedProperties:
22+
serializedVersion: 3
23+
m_TexEnvs:
24+
- _BaseMap:
25+
m_Texture: {fileID: 0}
26+
m_Scale: {x: 1, y: 1}
27+
m_Offset: {x: 0, y: 0}
28+
- _BumpMap:
29+
m_Texture: {fileID: 0}
30+
m_Scale: {x: 1, y: 1}
31+
m_Offset: {x: 0, y: 0}
32+
- _DetailAlbedoMap:
33+
m_Texture: {fileID: 0}
34+
m_Scale: {x: 1, y: 1}
35+
m_Offset: {x: 0, y: 0}
36+
- _DetailMask:
37+
m_Texture: {fileID: 0}
38+
m_Scale: {x: 1, y: 1}
39+
m_Offset: {x: 0, y: 0}
40+
- _DetailNormalMap:
41+
m_Texture: {fileID: 0}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
44+
- _EmissionMap:
45+
m_Texture: {fileID: 0}
46+
m_Scale: {x: 1, y: 1}
47+
m_Offset: {x: 0, y: 0}
48+
- _MainTex:
49+
m_Texture: {fileID: 0}
50+
m_Scale: {x: 1, y: 1}
51+
m_Offset: {x: 0, y: 0}
52+
- _MetallicGlossMap:
53+
m_Texture: {fileID: 0}
54+
m_Scale: {x: 1, y: 1}
55+
m_Offset: {x: 0, y: 0}
56+
- _OcclusionMap:
57+
m_Texture: {fileID: 0}
58+
m_Scale: {x: 1, y: 1}
59+
m_Offset: {x: 0, y: 0}
60+
- _ParallaxMap:
61+
m_Texture: {fileID: 0}
62+
m_Scale: {x: 1, y: 1}
63+
m_Offset: {x: 0, y: 0}
64+
- _SpecGlossMap:
65+
m_Texture: {fileID: 0}
66+
m_Scale: {x: 1, y: 1}
67+
m_Offset: {x: 0, y: 0}
68+
- unity_Lightmaps:
69+
m_Texture: {fileID: 0}
70+
m_Scale: {x: 1, y: 1}
71+
m_Offset: {x: 0, y: 0}
72+
- unity_LightmapsInd:
73+
m_Texture: {fileID: 0}
74+
m_Scale: {x: 1, y: 1}
75+
m_Offset: {x: 0, y: 0}
76+
- unity_ShadowMasks:
77+
m_Texture: {fileID: 0}
78+
m_Scale: {x: 1, y: 1}
79+
m_Offset: {x: 0, y: 0}
80+
m_Floats:
81+
- _AlphaClip: 0
82+
- _Blend: 2
83+
- _BlendOp: 0
84+
- _BumpScale: 1
85+
- _CameraFadingEnabled: 1
86+
- _CameraFarFadeDistance: 4
87+
- _CameraNearFadeDistance: 1
88+
- _ClearCoatMask: 0
89+
- _ClearCoatSmoothness: 0
90+
- _ColorMode: 0
91+
- _Cull: 2
92+
- _Cutoff: 0.5
93+
- _DetailAlbedoMapScale: 1
94+
- _DetailNormalMapScale: 1
95+
- _DistortionBlend: 0
96+
- _DistortionEnabled: 0
97+
- _DistortionStrength: 2.2
98+
- _DistortionStrengthScaled: 0.22000001
99+
- _DstBlend: 1
100+
- _EnvironmentReflections: 1
101+
- _FlipbookBlending: 0
102+
- _FlipbookMode: 0
103+
- _GlossMapScale: 0
104+
- _Glossiness: 0
105+
- _GlossyReflections: 0
106+
- _Metallic: 0
107+
- _Mode: 0
108+
- _OcclusionStrength: 1
109+
- _Parallax: 0.005
110+
- _QueueOffset: 0
111+
- _ReceiveShadows: 1
112+
- _Smoothness: 0.5
113+
- _SmoothnessTextureChannel: 0
114+
- _SoftParticlesEnabled: 1
115+
- _SoftParticlesFarFadeDistance: 3
116+
- _SoftParticlesNearFadeDistance: 0
117+
- _SpecularHighlights: 1
118+
- _SrcBlend: 5
119+
- _Surface: 1
120+
- _WorkflowMode: 1
121+
- _ZWrite: 0
122+
m_Colors:
123+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
124+
- _BaseColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
125+
- _CameraFadeParams: {r: 1, g: 0.33333334, b: 0, a: 0}
126+
- _Color: {r: 1, g: 1, b: 1, a: 1}
127+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
128+
- _SoftParticleFadeParams: {r: 0, g: 0.33333334, b: 0, a: 0}
129+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
130+
m_BuildTextureStacks: []
131+
--- !u!114 &4418744183211160777
132+
MonoBehaviour:
133+
m_ObjectHideFlags: 11
134+
m_CorrespondingSourceObject: {fileID: 0}
135+
m_PrefabInstance: {fileID: 0}
136+
m_PrefabAsset: {fileID: 0}
137+
m_GameObject: {fileID: 0}
138+
m_Enabled: 1
139+
m_EditorHideFlags: 0
140+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
141+
m_Name:
142+
m_EditorClassIdentifier:
143+
version: 4

‎UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/02965f65a354475fa6b05163138d6b2b.asset.meta renamed to ‎UOP1_Project/Assets/Art/Effects/CookingSteam/CookingSteam.mat.meta

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

‎UOP1_Project/Assets/Art/Props/BeerKeg/BeerKeg.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Material:
1212
type: 3}
1313
m_ShaderKeywords:
1414
m_LightmapFlags: 4
15-
m_EnableInstancingVariants: 0
15+
m_EnableInstancingVariants: 1
1616
m_DoubleSidedGI: 0
1717
m_CustomRenderQueue: -1
1818
stringTagMap: {}

‎UOP1_Project/Assets/Art/Props/BeerKeg/BeerKeg.png

-307 KB
Loading

‎UOP1_Project/Assets/Art/Props/Cooking.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.

‎UOP1_Project/Assets/Art/Props/Cooking/Broth.mat

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-7406214595485318278
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 11
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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
version: 4
16+
--- !u!21 &2100000
17+
Material:
18+
serializedVersion: 6
19+
m_ObjectHideFlags: 0
20+
m_CorrespondingSourceObject: {fileID: 0}
21+
m_PrefabInstance: {fileID: 0}
22+
m_PrefabAsset: {fileID: 0}
23+
m_Name: Broth
24+
m_Shader: {fileID: -6465566751694194690, guid: 6308ea4821d1aeb4cbe77aa991079282,
25+
type: 3}
26+
m_ShaderKeywords:
27+
m_LightmapFlags: 4
28+
m_EnableInstancingVariants: 1
29+
m_DoubleSidedGI: 0
30+
m_CustomRenderQueue: -1
31+
stringTagMap: {}
32+
disabledShaderPasses: []
33+
m_SavedProperties:
34+
serializedVersion: 3
35+
m_TexEnvs:
36+
- Texture2D_300EB541:
37+
m_Texture: {fileID: 0}
38+
m_Scale: {x: 1, y: 1}
39+
m_Offset: {x: 0, y: 0}
40+
- _BaseMap:
41+
m_Texture: {fileID: 0}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
44+
- _BumpMap:
45+
m_Texture: {fileID: 0}
46+
m_Scale: {x: 1, y: 1}
47+
m_Offset: {x: 0, y: 0}
48+
- _DetailAlbedoMap:
49+
m_Texture: {fileID: 0}
50+
m_Scale: {x: 1, y: 1}
51+
m_Offset: {x: 0, y: 0}
52+
- _DetailMask:
53+
m_Texture: {fileID: 0}
54+
m_Scale: {x: 1, y: 1}
55+
m_Offset: {x: 0, y: 0}
56+
- _DetailNormalMap:
57+
m_Texture: {fileID: 0}
58+
m_Scale: {x: 1, y: 1}
59+
m_Offset: {x: 0, y: 0}
60+
- _EmissionMap:
61+
m_Texture: {fileID: 0}
62+
m_Scale: {x: 1, y: 1}
63+
m_Offset: {x: 0, y: 0}
64+
- _MainTex:
65+
m_Texture: {fileID: 0}
66+
m_Scale: {x: 1, y: 1}
67+
m_Offset: {x: 0, y: 0}
68+
- _MainTexture:
69+
m_Texture: {fileID: 0}
70+
m_Scale: {x: 1, y: 1}
71+
m_Offset: {x: 0, y: 0}
72+
- _MetallicGlossMap:
73+
m_Texture: {fileID: 0}
74+
m_Scale: {x: 1, y: 1}
75+
m_Offset: {x: 0, y: 0}
76+
- _OcclusionMap:
77+
m_Texture: {fileID: 0}
78+
m_Scale: {x: 1, y: 1}
79+
m_Offset: {x: 0, y: 0}
80+
- _ParallaxMap:
81+
m_Texture: {fileID: 0}
82+
m_Scale: {x: 1, y: 1}
83+
m_Offset: {x: 0, y: 0}
84+
- _SpecGlossMap:
85+
m_Texture: {fileID: 0}
86+
m_Scale: {x: 1, y: 1}
87+
m_Offset: {x: 0, y: 0}
88+
- _SpecularMap:
89+
m_Texture: {fileID: 0}
90+
m_Scale: {x: 1, y: 1}
91+
m_Offset: {x: 0, y: 0}
92+
- unity_Lightmaps:
93+
m_Texture: {fileID: 0}
94+
m_Scale: {x: 1, y: 1}
95+
m_Offset: {x: 0, y: 0}
96+
- unity_LightmapsInd:
97+
m_Texture: {fileID: 0}
98+
m_Scale: {x: 1, y: 1}
99+
m_Offset: {x: 0, y: 0}
100+
- unity_ShadowMasks:
101+
m_Texture: {fileID: 0}
102+
m_Scale: {x: 1, y: 1}
103+
m_Offset: {x: 0, y: 0}
104+
m_Floats:
105+
- Vector1_398E6F7F: 0.5
106+
- Vector1_8606F96E: 0
107+
- _AlphaClip: 0
108+
- _Blend: 0
109+
- _BumpScale: 1
110+
- _ClearCoatMask: 0
111+
- _ClearCoatSmoothness: 0
112+
- _Cull: 2
113+
- _Cutoff: 0.5
114+
- _DetailAlbedoMapScale: 1
115+
- _DetailNormalMapScale: 1
116+
- _DstBlend: 0
117+
- _EnvironmentReflections: 1
118+
- _FresnelOpacity: 0.04
119+
- _Fresnel_Power: 2.18
120+
- _GlossMapScale: 0
121+
- _Glossiness: 0
122+
- _GlossyReflections: 0
123+
- _Metallic: 0
124+
- _OcclusionStrength: 1
125+
- _Parallax: 0.005
126+
- _QueueOffset: 0
127+
- _ReceiveShadows: 1
128+
- _Smoothness: 0.586
129+
- _SmoothnessTextureChannel: 0
130+
- _SpecularHighlights: 1
131+
- _SrcBlend: 1
132+
- _Surface: 0
133+
- _WorkflowMode: 1
134+
- _ZWrite: 1
135+
m_Colors:
136+
- Color_9BF846A1: {r: 0.5, g: 0.3269987, b: 0.14420485, a: 0.9019608}
137+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
138+
- _Color: {r: 1, g: 1, b: 1, a: 1}
139+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
140+
- _MainColor: {r: 0.7169812, g: 0.558117, b: 0.32853585, a: 0}
141+
- _Offset: {r: 0, g: 0, b: 0, a: 0}
142+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
143+
- _SpecularColor: {r: 0, g: 0, b: 0, a: 0}
144+
- _Tiling: {r: 1, g: 1, b: 0, a: 0}
145+
m_BuildTextureStacks: []

‎UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/02a28a9c355f4fac879be8ab591f1a6a.asset.meta renamed to ‎UOP1_Project/Assets/Art/Props/Cooking/Broth.mat.meta

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

‎UOP1_Project/Assets/Art/Props/Cooking/Wok.fbx

47 KB
Binary file not shown.

0 commit comments

Comments
 (0)