Skip to content

Commit d6f4c8c

Browse files
ciro-unityciro-unity
committed
Ayud and Felfel looks
1 parent bc45541 commit d6f4c8c

File tree

9 files changed

+276
-52
lines changed

9 files changed

+276
-52
lines changed

‎UOP1_Project/Assets/Art/Accessories/Moustache/MoustacheBlack.mat

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
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: MoustacheBlack
11+
m_Shader: {fileID: -6465566751694194690, guid: c2f57d091fa8e17459a737c31526637b,
12+
type: 3}
13+
m_ShaderKeywords:
14+
m_LightmapFlags: 4
15+
m_EnableInstancingVariants: 1
16+
m_DoubleSidedGI: 0
17+
m_CustomRenderQueue: -1
18+
stringTagMap: {}
19+
disabledShaderPasses: []
20+
m_SavedProperties:
21+
serializedVersion: 3
22+
m_TexEnvs:
23+
- Texture2D_4036A321:
24+
m_Texture: {fileID: 2800000, guid: 8e508863ca9acdf4daeb1bcdd8e0221c, type: 3}
25+
m_Scale: {x: 1, y: 1}
26+
m_Offset: {x: 0, y: 0}
27+
- _BaseMap:
28+
m_Texture: {fileID: 0}
29+
m_Scale: {x: 1, y: 1}
30+
m_Offset: {x: 0, y: 0}
31+
- _BumpMap:
32+
m_Texture: {fileID: 0}
33+
m_Scale: {x: 1, y: 1}
34+
m_Offset: {x: 0, y: 0}
35+
- _EmissionMap:
36+
m_Texture: {fileID: 0}
37+
m_Scale: {x: 1, y: 1}
38+
m_Offset: {x: 0, y: 0}
39+
- _MainTex:
40+
m_Texture: {fileID: 0}
41+
m_Scale: {x: 1, y: 1}
42+
m_Offset: {x: 0, y: 0}
43+
- _MainTexture:
44+
m_Texture: {fileID: 0}
45+
m_Scale: {x: 1, y: 1}
46+
m_Offset: {x: 0, y: 0}
47+
- _MetallicGlossMap:
48+
m_Texture: {fileID: 0}
49+
m_Scale: {x: 1, y: 1}
50+
m_Offset: {x: 0, y: 0}
51+
- _OcclusionMap:
52+
m_Texture: {fileID: 0}
53+
m_Scale: {x: 1, y: 1}
54+
m_Offset: {x: 0, y: 0}
55+
- _SpecGlossMap:
56+
m_Texture: {fileID: 0}
57+
m_Scale: {x: 1, y: 1}
58+
m_Offset: {x: 0, y: 0}
59+
- _SpecularMap:
60+
m_Texture: {fileID: 0}
61+
m_Scale: {x: 1, y: 1}
62+
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}
75+
m_Floats:
76+
- _AlphaClip: 0
77+
- _Blend: 0
78+
- _BumpScale: 1
79+
- _Cull: 2
80+
- _Cutoff: 0.5
81+
- _DstBlend: 0
82+
- _EnvironmentReflections: 1
83+
- _GlossMapScale: 0
84+
- _Glossiness: 0
85+
- _GlossyReflections: 0
86+
- _LightProbeContribution: 3.5
87+
- _Metallic: 0
88+
- _OcclusionStrength: 1
89+
- _OutlineDepthSensitivity: 0.5
90+
- _OutlineNormalsSensitivity: 0.5
91+
- _OutlineThickness: 0
92+
- _QueueOffset: 0
93+
- _ReceiveShadows: 1
94+
- _Smoothness: 0
95+
- _SmoothnessTextureChannel: 0
96+
- _SpecularHighlights: 1
97+
- _SrcBlend: 1
98+
- _Surface: 0
99+
- _WorkflowMode: 1
100+
- _ZWrite: 1
101+
m_Colors:
102+
- Color_551FE3E8: {r: 0, g: 0, b: 0, a: 0}
103+
- Color_5678DAF5: {r: 1, g: 1, b: 1, a: 0}
104+
- Color_BD765EA0: {r: 0.103773594, g: 0.103773594, b: 0.103773594, a: 0}
105+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
106+
- _Color: {r: 1, g: 1, b: 1, a: 1}
107+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
108+
- _MainColor: {r: 1, g: 1, b: 1, a: 0}
109+
- _Offset: {r: 0, g: 0, b: 0, a: 0}
110+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
111+
- _SpecularColor: {r: 0, g: 0, b: 0, a: 0}
112+
- _Tiling: {r: 1, g: 1, b: 0, a: 0}
113+
m_BuildTextureStacks: []
114+
--- !u!114 &7079221975417235924
115+
MonoBehaviour:
116+
m_ObjectHideFlags: 11
117+
m_CorrespondingSourceObject: {fileID: 0}
118+
m_PrefabInstance: {fileID: 0}
119+
m_PrefabAsset: {fileID: 0}
120+
m_GameObject: {fileID: 0}
121+
m_Enabled: 1
122+
m_EditorHideFlags: 0
123+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
124+
m_Name:
125+
m_EditorClassIdentifier:
126+
version: 2

‎UOP1_Project/Assets/Art/Accessories/Moustache/MoustacheBlack.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/Accessories/Moustache/moustache.mat renamed to ‎UOP1_Project/Assets/Art/Accessories/Moustache/MoustacheBrown.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Material:
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
10-
m_Name: moustache
10+
m_Name: MoustacheBrown
1111
m_Shader: {fileID: -6465566751694194690, guid: c2f57d091fa8e17459a737c31526637b,
1212
type: 3}
1313
m_ShaderKeywords:

‎UOP1_Project/Assets/Art/Accessories/Moustache/moustache.mat.meta renamed to ‎UOP1_Project/Assets/Art/Accessories/Moustache/MoustacheBrown.mat.meta

File renamed without changes.

‎UOP1_Project/Assets/Art/Accessories/StrawOfHay/HayStraw_Texture.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/Characters/Townsfolk_M/Townsfolk_Ayud.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ Material:
121121
- _ZWrite: 1
122122
m_Colors:
123123
- Color_551FE3E8: {r: 1, g: 0.49595684, b: 0.49595684, a: 0}
124-
- Color_5678DAF5: {r: 0.34539488, g: 0.4433962, b: 0.4401915, a: 0}
124+
- Color_5678DAF5: {r: 0.42490974, g: 0.45964465, b: 0.5660378, a: 0}
125125
- Color_BD765EA0: {r: 0.6415094, g: 0.6415094, b: 0.6415094, a: 0}
126126
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
127127
- _Color: {r: 1, g: 1, b: 1, a: 1}

‎UOP1_Project/Assets/Art/Characters/Townsfolk_M/Townsfolk_Felfel.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ Material:
121121
- _ZWrite: 1
122122
m_Colors:
123123
- Color_551FE3E8: {r: 0.2735849, g: 0.2735849, b: 0.2735849, a: 0}
124-
- Color_5678DAF5: {r: 0.21698111, g: 0.21698111, b: 0.21698111, a: 0}
124+
- Color_5678DAF5: {r: 0.254717, g: 0.254717, b: 0.254717, a: 0}
125125
- Color_BD765EA0: {r: 0.4433962, g: 0.311931, b: 0.311931, a: 0}
126126
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
127127
- _Color: {r: 1, g: 1, b: 1, a: 1}

‎UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/Ayud.prefab

Lines changed: 39 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ PrefabInstance:
1515
- target: {fileID: 1132113797398714843, guid: 661c491ac76af4b429f8a8c0e6e8c762,
1616
type: 3}
1717
propertyPath: m_Lens.m_SensorSize.x
18-
value: 1.7783554
18+
value: 1.778039
1919
objectReference: {fileID: 0}
2020
- target: {fileID: 2803440263876833388, guid: 661c491ac76af4b429f8a8c0e6e8c762,
2121
type: 3}
@@ -45,7 +45,7 @@ PrefabInstance:
4545
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
4646
type: 3}
4747
propertyPath: m_LocalPosition.y
48-
value: 1.2725528
48+
value: 1.2725531
4949
objectReference: {fileID: 0}
5050
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
5151
type: 3}
@@ -60,7 +60,7 @@ PrefabInstance:
6060
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
6161
type: 3}
6262
propertyPath: m_LocalRotation.x
63-
value: 0.035948653
63+
value: 0.03594869
6464
objectReference: {fileID: 0}
6565
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
6666
type: 3}
@@ -70,7 +70,7 @@ PrefabInstance:
7070
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
7171
type: 3}
7272
propertyPath: m_LocalRotation.z
73-
value: 0.03348812
73+
value: 0.033488136
7474
objectReference: {fileID: 0}
7575
- target: {fileID: 5579597578339563075, guid: 661c491ac76af4b429f8a8c0e6e8c762,
7676
type: 3}
@@ -156,6 +156,12 @@ Transform:
156156
type: 3}
157157
m_PrefabInstance: {fileID: 267521092364063392}
158158
m_PrefabAsset: {fileID: 0}
159+
--- !u!4 &3498401952861897673 stripped
160+
Transform:
161+
m_CorrespondingSourceObject: {fileID: 3691472912802713961, guid: 661c491ac76af4b429f8a8c0e6e8c762,
162+
type: 3}
163+
m_PrefabInstance: {fileID: 267521092364063392}
164+
m_PrefabAsset: {fileID: 0}
159165
--- !u!1001 &1533371131138027829
160166
PrefabInstance:
161167
m_ObjectHideFlags: 0
@@ -171,7 +177,7 @@ PrefabInstance:
171177
- target: {fileID: 3143522343821103927, guid: 0392be4dd75ff85428440a20f3fb1baa,
172178
type: 3}
173179
propertyPath: m_RootOrder
174-
value: 12
180+
value: 11
175181
objectReference: {fileID: 0}
176182
- target: {fileID: 3143522343821103927, guid: 0392be4dd75ff85428440a20f3fb1baa,
177183
type: 3}
@@ -225,90 +231,75 @@ PrefabInstance:
225231
objectReference: {fileID: 0}
226232
m_RemovedComponents: []
227233
m_SourcePrefab: {fileID: 100100000, guid: 0392be4dd75ff85428440a20f3fb1baa, type: 3}
228-
--- !u!1001 &2194370440087143919
234+
--- !u!1001 &3032137743522899088
229235
PrefabInstance:
230236
m_ObjectHideFlags: 0
231237
serializedVersion: 2
232238
m_Modification:
233-
m_TransformParent: {fileID: 2164902606267540873}
239+
m_TransformParent: {fileID: 3498401952861897673}
234240
m_Modifications:
235-
- target: {fileID: 3601518599378888090, guid: e09d6eae07e747f418676fe4e4acc0ca,
241+
- target: {fileID: 4000410594485479123, guid: 3426336e4653388499cada9230475081,
236242
type: 3}
237243
propertyPath: m_Name
238-
value: Moustache
244+
value: HayStraw
239245
objectReference: {fileID: 0}
240-
- target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
246+
- target: {fileID: 4381862322758777961, guid: 3426336e4653388499cada9230475081,
241247
type: 3}
242248
propertyPath: m_RootOrder
243-
value: 11
244-
objectReference: {fileID: 0}
245-
- target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
246-
type: 3}
247-
propertyPath: m_LocalScale.x
248-
value: 99.999985
249-
objectReference: {fileID: 0}
250-
- target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
251-
type: 3}
252-
propertyPath: m_LocalScale.y
253-
value: 99.999985
254-
objectReference: {fileID: 0}
255-
- target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
256-
type: 3}
257-
propertyPath: m_LocalScale.z
258-
value: 99.999985
249+
value: 0
259250
objectReference: {fileID: 0}
260-
- target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
251+
- target: {fileID: 4381862322758777961, guid: 3426336e4653388499cada9230475081,
261252
type: 3}
262253
propertyPath: m_LocalPosition.x
263-
value: -0.023
254+
value: 0.054
264255
objectReference: {fileID: 0}
265-
- target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
256+
- target: {fileID: 4381862322758777961, guid: 3426336e4653388499cada9230475081,
266257
type: 3}
267258
propertyPath: m_LocalPosition.y
268-
value: 0.292
259+
value: 0.005
269260
objectReference: {fileID: 0}
270-
- target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
261+
- target: {fileID: 4381862322758777961, guid: 3426336e4653388499cada9230475081,
271262
type: 3}
272263
propertyPath: m_LocalPosition.z
273-
value: 0.002
264+
value: -0.019
274265
objectReference: {fileID: 0}
275-
- target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
266+
- target: {fileID: 4381862322758777961, guid: 3426336e4653388499cada9230475081,
276267
type: 3}
277268
propertyPath: m_LocalRotation.w
278-
value: -0.007849206
269+
value: 0.6936596
279270
objectReference: {fileID: 0}
280-
- target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
271+
- target: {fileID: 4381862322758777961, guid: 3426336e4653388499cada9230475081,
281272
type: 3}
282273
propertyPath: m_LocalRotation.x
283-
value: 0.6882114
274+
value: 0.14260173
284275
objectReference: {fileID: 0}
285-
- target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
276+
- target: {fileID: 4381862322758777961, guid: 3426336e4653388499cada9230475081,
286277
type: 3}
287278
propertyPath: m_LocalRotation.y
288-
value: -0.0039805057
279+
value: -0.69734114
289280
objectReference: {fileID: 0}
290-
- target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
281+
- target: {fileID: 4381862322758777961, guid: 3426336e4653388499cada9230475081,
291282
type: 3}
292283
propertyPath: m_LocalRotation.z
293-
value: -0.7254568
284+
value: 0.11052803
294285
objectReference: {fileID: 0}
295-
- target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
286+
- target: {fileID: 4381862322758777961, guid: 3426336e4653388499cada9230475081,
296287
type: 3}
297288
propertyPath: m_LocalEulerAnglesHint.x
298-
value: 180.95
289+
value: 20.609
299290
objectReference: {fileID: 0}
300-
- target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
291+
- target: {fileID: 4381862322758777961, guid: 3426336e4653388499cada9230475081,
301292
type: 3}
302293
propertyPath: m_LocalEulerAnglesHint.y
303-
value: 93.021
294+
value: -90.81
304295
objectReference: {fileID: 0}
305-
- target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
296+
- target: {fileID: 4381862322758777961, guid: 3426336e4653388499cada9230475081,
306297
type: 3}
307298
propertyPath: m_LocalEulerAnglesHint.z
308-
value: -0.33898926
299+
value: -2.789
309300
objectReference: {fileID: 0}
310301
m_RemovedComponents: []
311-
m_SourcePrefab: {fileID: 100100000, guid: e09d6eae07e747f418676fe4e4acc0ca, type: 3}
302+
m_SourcePrefab: {fileID: 100100000, guid: 3426336e4653388499cada9230475081, type: 3}
312303
--- !u!1001 &5134495324099213723
313304
PrefabInstance:
314305
m_ObjectHideFlags: 0
@@ -319,7 +310,7 @@ PrefabInstance:
319310
- target: {fileID: 63635585994123085, guid: f4bbe6c61a38d71448053046dfd3994c,
320311
type: 3}
321312
propertyPath: m_RootOrder
322-
value: 13
313+
value: 12
323314
objectReference: {fileID: 0}
324315
- target: {fileID: 63635585994123085, guid: f4bbe6c61a38d71448053046dfd3994c,
325316
type: 3}

0 commit comments

Comments
 (0)