Skip to content

Commit 83d069d

Browse files
ciro-unityciro-unity
committed
Art tweaks
1 parent df742ac commit 83d069d

16 files changed

+559
-11
lines changed

‎UOP1_Project/Assets/Art/Effects/Fire/Halo.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Material:
138138
- _WorkflowMode: 1
139139
- _ZWrite: 0
140140
m_Colors:
141-
- _BaseColor: {r: 0.6603774, g: 0.5761682, b: 0, a: 0.03137255}
141+
- _BaseColor: {r: 1, g: 0.75294125, b: 0, a: 0.043137256}
142142
- _BaseColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
143143
- _CameraFadeParams: {r: 0, g: 0.21321961, b: 0, a: 0}
144144
- _Color: {r: 1, g: 1, b: 1, a: 1}

‎UOP1_Project/Assets/Art/Effects/Fire/HaloStrong.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Material:
138138
- _WorkflowMode: 1
139139
- _ZWrite: 0
140140
m_Colors:
141-
- _BaseColor: {r: 0.75471693, g: 0.6670774, b: 0.17494783, a: 0.07058824}
141+
- _BaseColor: {r: 1, g: 0.7529412, b: 0, a: 0.09803922}
142142
- _BaseColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
143143
- _CameraFadeParams: {r: 0, g: 0.21321961, b: 0, a: 0}
144144
- _Color: {r: 1, g: 1, b: 1, a: 1}

‎UOP1_Project/Assets/Art/Nature/Ground/Landmasses.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Material:
2626
m_ShaderKeywords:
2727
m_LightmapFlags: 4
2828
m_EnableInstancingVariants: 0
29-
m_DoubleSidedGI: 1
29+
m_DoubleSidedGI: 0
3030
m_CustomRenderQueue: -1
3131
stringTagMap: {}
3232
disabledShaderPasses: []

‎UOP1_Project/Assets/Art/Props/Festival/TentCover.mat renamed to ‎UOP1_Project/Assets/Art/Props/Festival/TentCoverBeige.mat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Material:
2020
m_CorrespondingSourceObject: {fileID: 0}
2121
m_PrefabInstance: {fileID: 0}
2222
m_PrefabAsset: {fileID: 0}
23-
m_Name: TentCover
23+
m_Name: TentCoverBeige
2424
m_Shader: {fileID: -6465566751694194690, guid: bf36778a400a0894b86a1f49c422fa62,
2525
type: 3}
2626
m_ShaderKeywords:
@@ -122,7 +122,7 @@ Material:
122122
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
123123
- _Color: {r: 1, g: 1, b: 1, a: 1}
124124
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
125-
- _MainColor: {r: 0.7735849, g: 0.44411337, b: 0.28879112, a: 0}
125+
- _MainColor: {r: 0.7830189, g: 0.66183037, b: 0.46960026, a: 0}
126126
- _Offset: {r: 0, g: 0, b: 0, a: 0}
127127
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
128128
- _SpecularColor: {r: 0.4811321, g: 0.4668667, b: 0.43833596, a: 0}

‎UOP1_Project/Assets/Art/Props/Festival/TentCoverBeige.mat.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/Festival/TentCoverBeige2.mat

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-6610214270474274221
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: 2
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: TentCoverBeige2
24+
m_Shader: {fileID: -6465566751694194690, guid: bf36778a400a0894b86a1f49c422fa62,
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+
- Texture2D_4036A321:
41+
m_Texture: {fileID: 2800000, guid: 0b510b1ae4b24924c93ba45a08b5ea19, type: 3}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
44+
- _BaseMap:
45+
m_Texture: {fileID: 0}
46+
m_Scale: {x: 1, y: 1}
47+
m_Offset: {x: 0, y: 0}
48+
- _BumpMap:
49+
m_Texture: {fileID: 0}
50+
m_Scale: {x: 1, y: 1}
51+
m_Offset: {x: 0, y: 0}
52+
- _EmissionMap:
53+
m_Texture: {fileID: 0}
54+
m_Scale: {x: 1, y: 1}
55+
m_Offset: {x: 0, y: 0}
56+
- _MainTex:
57+
m_Texture: {fileID: 0}
58+
m_Scale: {x: 1, y: 1}
59+
m_Offset: {x: 0, y: 0}
60+
- _MainTexture:
61+
m_Texture: {fileID: 0}
62+
m_Scale: {x: 1, y: 1}
63+
m_Offset: {x: 0, y: 0}
64+
- _MetallicGlossMap:
65+
m_Texture: {fileID: 0}
66+
m_Scale: {x: 1, y: 1}
67+
m_Offset: {x: 0, y: 0}
68+
- _OcclusionMap:
69+
m_Texture: {fileID: 0}
70+
m_Scale: {x: 1, y: 1}
71+
m_Offset: {x: 0, y: 0}
72+
- _SpecGlossMap:
73+
m_Texture: {fileID: 0}
74+
m_Scale: {x: 1, y: 1}
75+
m_Offset: {x: 0, y: 0}
76+
- _SpecularMap:
77+
m_Texture: {fileID: 0}
78+
m_Scale: {x: 1, y: 1}
79+
m_Offset: {x: 0, y: 0}
80+
- unity_Lightmaps:
81+
m_Texture: {fileID: 0}
82+
m_Scale: {x: 1, y: 1}
83+
m_Offset: {x: 0, y: 0}
84+
- unity_LightmapsInd:
85+
m_Texture: {fileID: 0}
86+
m_Scale: {x: 1, y: 1}
87+
m_Offset: {x: 0, y: 0}
88+
- unity_ShadowMasks:
89+
m_Texture: {fileID: 0}
90+
m_Scale: {x: 1, y: 1}
91+
m_Offset: {x: 0, y: 0}
92+
m_Floats:
93+
- Vector1_8606F96E: 0
94+
- _AlphaClip: 0
95+
- _Blend: 0
96+
- _BumpScale: 1
97+
- _Cull: 2
98+
- _Cutoff: 0.5
99+
- _DstBlend: 0
100+
- _EnvironmentReflections: 1
101+
- _GlossMapScale: 0
102+
- _Glossiness: 0
103+
- _GlossyReflections: 0
104+
- _Metallic: 0
105+
- _OcclusionStrength: 1
106+
- _OutlineDepthSensitivity: 1
107+
- _OutlineNormalsSensitivity: 1
108+
- _OutlineThickness: 1
109+
- _QueueOffset: 0
110+
- _ReceiveShadows: 1
111+
- _Smoothness: 0.364
112+
- _SmoothnessTextureChannel: 0
113+
- _SpecularHighlights: 1
114+
- _SrcBlend: 1
115+
- _Surface: 0
116+
- _WorkflowMode: 1
117+
- _ZWrite: 1
118+
m_Colors:
119+
- Color_551FE3E8: {r: 0.9960785, g: 0.4784314, b: 0, a: 0}
120+
- Color_5678DAF5: {r: 0.9960785, g: 0.67058825, b: 0, a: 0}
121+
- Color_BD765EA0: {r: 0.9960785, g: 0.882353, b: 0.3921569, a: 0}
122+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
123+
- _Color: {r: 1, g: 1, b: 1, a: 1}
124+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
125+
- _MainColor: {r: 0.735849, g: 0.59180313, b: 0.4066012, a: 0}
126+
- _Offset: {r: 0, g: 0, b: 0, a: 0}
127+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
128+
- _SpecularColor: {r: 0.4811321, g: 0.4668667, b: 0.43833596, a: 0}
129+
- _Tiling: {r: 1, g: 1, b: 0, a: 0}
130+
m_BuildTextureStacks: []

‎UOP1_Project/Assets/Art/Props/Festival/TentCoverBeige2.mat.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/Festival/TentCoverOrange.mat

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-6610214270474274221
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: 2
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: TentCoverOrange
24+
m_Shader: {fileID: -6465566751694194690, guid: bf36778a400a0894b86a1f49c422fa62,
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+
- Texture2D_4036A321:
41+
m_Texture: {fileID: 2800000, guid: 0b510b1ae4b24924c93ba45a08b5ea19, type: 3}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
44+
- _BaseMap:
45+
m_Texture: {fileID: 0}
46+
m_Scale: {x: 1, y: 1}
47+
m_Offset: {x: 0, y: 0}
48+
- _BumpMap:
49+
m_Texture: {fileID: 0}
50+
m_Scale: {x: 1, y: 1}
51+
m_Offset: {x: 0, y: 0}
52+
- _EmissionMap:
53+
m_Texture: {fileID: 0}
54+
m_Scale: {x: 1, y: 1}
55+
m_Offset: {x: 0, y: 0}
56+
- _MainTex:
57+
m_Texture: {fileID: 0}
58+
m_Scale: {x: 1, y: 1}
59+
m_Offset: {x: 0, y: 0}
60+
- _MainTexture:
61+
m_Texture: {fileID: 0}
62+
m_Scale: {x: 1, y: 1}
63+
m_Offset: {x: 0, y: 0}
64+
- _MetallicGlossMap:
65+
m_Texture: {fileID: 0}
66+
m_Scale: {x: 1, y: 1}
67+
m_Offset: {x: 0, y: 0}
68+
- _OcclusionMap:
69+
m_Texture: {fileID: 0}
70+
m_Scale: {x: 1, y: 1}
71+
m_Offset: {x: 0, y: 0}
72+
- _SpecGlossMap:
73+
m_Texture: {fileID: 0}
74+
m_Scale: {x: 1, y: 1}
75+
m_Offset: {x: 0, y: 0}
76+
- _SpecularMap:
77+
m_Texture: {fileID: 0}
78+
m_Scale: {x: 1, y: 1}
79+
m_Offset: {x: 0, y: 0}
80+
- unity_Lightmaps:
81+
m_Texture: {fileID: 0}
82+
m_Scale: {x: 1, y: 1}
83+
m_Offset: {x: 0, y: 0}
84+
- unity_LightmapsInd:
85+
m_Texture: {fileID: 0}
86+
m_Scale: {x: 1, y: 1}
87+
m_Offset: {x: 0, y: 0}
88+
- unity_ShadowMasks:
89+
m_Texture: {fileID: 0}
90+
m_Scale: {x: 1, y: 1}
91+
m_Offset: {x: 0, y: 0}
92+
m_Floats:
93+
- Vector1_8606F96E: 0
94+
- _AlphaClip: 0
95+
- _Blend: 0
96+
- _BumpScale: 1
97+
- _Cull: 2
98+
- _Cutoff: 0.5
99+
- _DstBlend: 0
100+
- _EnvironmentReflections: 1
101+
- _GlossMapScale: 0
102+
- _Glossiness: 0
103+
- _GlossyReflections: 0
104+
- _Metallic: 0
105+
- _OcclusionStrength: 1
106+
- _OutlineDepthSensitivity: 1
107+
- _OutlineNormalsSensitivity: 1
108+
- _OutlineThickness: 1
109+
- _QueueOffset: 0
110+
- _ReceiveShadows: 1
111+
- _Smoothness: 0.364
112+
- _SmoothnessTextureChannel: 0
113+
- _SpecularHighlights: 1
114+
- _SrcBlend: 1
115+
- _Surface: 0
116+
- _WorkflowMode: 1
117+
- _ZWrite: 1
118+
m_Colors:
119+
- Color_551FE3E8: {r: 0.9960785, g: 0.4784314, b: 0, a: 0}
120+
- Color_5678DAF5: {r: 0.9960785, g: 0.67058825, b: 0, a: 0}
121+
- Color_BD765EA0: {r: 0.9960785, g: 0.882353, b: 0.3921569, a: 0}
122+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
123+
- _Color: {r: 1, g: 1, b: 1, a: 1}
124+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
125+
- _MainColor: {r: 0.745283, g: 0.4872607, b: 0.25713265, a: 0}
126+
- _Offset: {r: 0, g: 0, b: 0, a: 0}
127+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
128+
- _SpecularColor: {r: 0.4811321, g: 0.4668667, b: 0.43833596, a: 0}
129+
- _Tiling: {r: 1, g: 1, b: 0, a: 0}
130+
m_BuildTextureStacks: []

‎UOP1_Project/Assets/Art/Props/Festival/TentCover.mat.meta renamed to ‎UOP1_Project/Assets/Art/Props/Festival/TentCoverOrange.mat.meta

File renamed without changes.

0 commit comments

Comments
 (0)