Skip to content

Commit bc45541

Browse files
ciro-unityciro-unity
committed
Interactables for Beach, Hill and Farms
1 parent 02d89ce commit bc45541

File tree

82 files changed

+7399
-2738
lines changed

Some content is hidden

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

82 files changed

+7399
-2738
lines changed

‎UOP1_Project/Assets/Art/Accessories/EarCurls/earCurls.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Material:
116116
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
117117
- _Color: {r: 1, g: 1, b: 1, a: 1}
118118
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
119-
- _MainColor: {r: 0.5754717, g: 0.36325458, b: 0.21444464, a: 0}
119+
- _MainColor: {r: 0.254717, g: 0.14832869, b: 0.07346285, a: 0}
120120
- _Offset: {r: 0, g: 0, b: 0, a: 0}
121121
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
122122
- _SpecularColor: {r: 1, g: 1, b: 1, a: 0}

‎UOP1_Project/Assets/Art/Accessories/Earring/Earring.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Material:
116116
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
117117
- _Color: {r: 1, g: 1, b: 1, a: 1}
118118
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
119-
- _MainColor: {r: 0.990566, g: 0.78668445, b: 0.032707386, a: 1}
119+
- _MainColor: {r: 0.8301887, g: 0.6666877, b: 0.23160249, a: 1}
120120
- _Offset: {r: 0, g: 0, b: 0, a: 0}
121121
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
122122
- _SpecularColor: {r: 0.99056596, g: 0.9274005, b: 0.7709594, a: 1}

‎UOP1_Project/Assets/Art/Accessories/Earring_Pearl/Earring_Pearl_Material.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Material:
116116
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
117117
- _Color: {r: 1, g: 1, b: 1, a: 1}
118118
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
119-
- _MainColor: {r: 1, g: 1, b: 1, a: 1}
119+
- _MainColor: {r: 1, g: 0.84299403, b: 0.7318059, a: 1}
120120
- _Offset: {r: 0, g: 0, b: 0, a: 0}
121121
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
122122
- _SpecularColor: {r: 0.99056596, g: 0.9274005, b: 0.7709594, a: 1}

‎UOP1_Project/Assets/Art/Accessories/Earring_Stone/Earring_Stone_Material.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Material:
105105
- _OutlineThickness: 0
106106
- _QueueOffset: 0
107107
- _ReceiveShadows: 1
108-
- _Smoothness: 0.251
108+
- _Smoothness: 0.5
109109
- _SmoothnessTextureChannel: 0
110110
- _SpecularHighlights: 1
111111
- _SrcBlend: 1

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

Lines changed: 6 additions & 6 deletions
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: {}
@@ -91,24 +91,24 @@ Material:
9191
- _OutlineThickness: 0
9292
- _QueueOffset: 0
9393
- _ReceiveShadows: 1
94-
- _Smoothness: 0.5
94+
- _Smoothness: 0
9595
- _SmoothnessTextureChannel: 0
9696
- _SpecularHighlights: 1
9797
- _SrcBlend: 1
9898
- _Surface: 0
9999
- _WorkflowMode: 1
100100
- _ZWrite: 1
101101
m_Colors:
102-
- Color_551FE3E8: {r: 0.1509434, g: 0.09628, b: 0.049127806, a: 0}
103-
- Color_5678DAF5: {r: 0.37254903, g: 0.24313727, b: 0.121568635, a: 0}
104-
- Color_BD765EA0: {r: 0.44313726, g: 0.29959053, b: 0.11372548, a: 0}
102+
- Color_551FE3E8: {r: 0.1509434, g: 0.105304815, b: 0.063469455, a: 0}
103+
- Color_5678DAF5: {r: 1, g: 1, b: 1, a: 0}
104+
- Color_BD765EA0: {r: 0.2264151, g: 0.13602373, b: 0.05248436, a: 0}
105105
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
106106
- _Color: {r: 1, g: 1, b: 1, a: 1}
107107
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
108108
- _MainColor: {r: 1, g: 1, b: 1, a: 0}
109109
- _Offset: {r: 0, g: 0, b: 0, a: 0}
110110
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
111-
- _SpecularColor: {r: 1, g: 1, b: 1, a: 0}
111+
- _SpecularColor: {r: 0, g: 0, b: 0, a: 0}
112112
- _Tiling: {r: 1, g: 1, b: 0, a: 0}
113113
m_BuildTextureStacks: []
114114
--- !u!114 &7079221975417235924

‎UOP1_Project/Assets/Art/Accessories/OldLady/Hair_OldLady.mat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ Material:
112112
- _WorkflowMode: 1
113113
- _ZWrite: 1
114114
m_Colors:
115-
- Color_551FE3E8: {r: 0.509434, g: 0.5058295, b: 0.50222504, a: 0}
116-
- Color_5678DAF5: {r: 0.5929379, g: 0.5915361, b: 0.5943396, a: 0}
117-
- Color_BD765EA0: {r: 0.3098523, g: 0.3098523, b: 0.31132078, a: 0}
115+
- Color_551FE3E8: {r: 0.4056604, g: 0.4056604, b: 0.4056604, a: 0}
116+
- Color_5678DAF5: {r: 0.3584906, g: 0.17430516, b: 0.069572285, a: 1}
117+
- Color_BD765EA0: {r: 0.3584906, g: 0.3584906, b: 0.3584906, a: 0}
118118
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
119119
- _Color: {r: 1, g: 1, b: 1, a: 1}
120120
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

‎UOP1_Project/Assets/Art/Characters/SlimeCritter/SlimeCritterBody_Orange_Base.mat

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ 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: {}
@@ -69,12 +69,24 @@ Material:
6969
m_Texture: {fileID: 0}
7070
m_Scale: {x: 1, y: 1}
7171
m_Offset: {x: 0, y: 0}
72+
- unity_Lightmaps:
73+
m_Texture: {fileID: 0}
74+
m_Scale: {x: 1, y: 1}
75+
m_Offset: {x: 0, y: 0}
76+
- unity_LightmapsInd:
77+
m_Texture: {fileID: 0}
78+
m_Scale: {x: 1, y: 1}
79+
m_Offset: {x: 0, y: 0}
80+
- unity_ShadowMasks:
81+
m_Texture: {fileID: 0}
82+
m_Scale: {x: 1, y: 1}
83+
m_Offset: {x: 0, y: 0}
7284
m_Floats:
7385
- Vector1_1C662FFD: 5
7486
- Vector1_2118372C: 0.4
7587
- Vector1_2CCC523D: 0.6
7688
- Vector1_5580A2BB: 3
77-
- Vector1_6B55B4E: 1.95
89+
- Vector1_6B55B4E: 3.49
7890
- Vector1_A4EAD20D: 0.05
7991
- Vector1_E93D1B7E: 0.4
8092
- Vector1_EA388E7D: 5
@@ -104,13 +116,14 @@ Material:
104116
- _WorkflowMode: 1
105117
- _ZWrite: 1
106118
m_Colors:
107-
- Color_4818C45D: {r: 1, g: 0.2688679, b: 0.2688679, a: 0}
119+
- Color_4818C45D: {r: 1, g: 0.26886788, b: 0.26886788, a: 0}
108120
- Vector3_271172D9: {r: 1, g: 1, b: -1, a: 0}
109121
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
110122
- _Color: {r: 1, g: 1, b: 1, a: 1}
111123
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
112-
- _MainColor: {r: 1, g: 0.70576715, b: 0.19339621, a: 0}
124+
- _MainColor: {r: 1, g: 0.6157598, b: 0, a: 0.90588236}
113125
- _Offset: {r: 0, g: 0, b: 0, a: 0}
114126
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
115-
- _SpecularColor: {r: 1, g: 0.93520164, b: 0.8537736, a: 1}
127+
- _SpecularColor: {r: 1, g: 0.6212064, b: 0.5336927, a: 1}
116128
- _Tiling: {r: 1, g: 1, b: 0, a: 0}
129+
m_BuildTextureStacks: []

‎UOP1_Project/Assets/Art/Characters/Townsfolk_F/Townsfolk_Cerise.mat

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-2174311012838905671
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: Townsfolk_Cerise
24+
m_Shader: {fileID: -6465566751694194690, guid: c2f57d091fa8e17459a737c31526637b,
25+
type: 3}
26+
m_ShaderKeywords:
27+
m_LightmapFlags: 4
28+
m_EnableInstancingVariants: 0
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: d34eb0119857b214aae13616c481744b, 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: 2800000, guid: 612ccbac2071647418ec376237e3fe4b, type: 3}
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: 2800000, guid: c6d18625cd0bb87488ffbba607b5caae, type: 3}
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+
- _LightProbeContribution: 5
105+
- _LightProbeMultiplier: 1
106+
- _Metallic: 0
107+
- _OcclusionStrength: 1
108+
- _OutlineDepthSensitivity: 0.3
109+
- _OutlineNormalsSensitivity: 0.4
110+
- _OutlineThickness: 0
111+
- _QueueOffset: 0
112+
- _ReceiveShadows: 1
113+
- _Smoothness: 0.1
114+
- _SmoothnessTextureChannel: 0
115+
- _SpecularHighlights: 1
116+
- _SrcBlend: 1
117+
- _Surface: 0
118+
- _WorkflowMode: 1
119+
- _ZWrite: 1
120+
m_Colors:
121+
- Color_551FE3E8: {r: 1, g: 1, b: 1, a: 0}
122+
- Color_5678DAF5: {r: 0.8584906, g: 0.6849413, b: 0.75179887, a: 0}
123+
- Color_BD765EA0: {r: 0.37888417, g: 0.6826643, b: 0.9433962, a: 0}
124+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
125+
- _Color: {r: 1, g: 1, b: 1, a: 1}
126+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
127+
- _MainColor: {r: 1, g: 1, b: 1, a: 0}
128+
- _Offset: {r: 0, g: 0, b: 0, a: 0}
129+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
130+
- _SpecularColor: {r: 0.3999999, g: 0.3999999, b: 0.3999999, a: 0.2}
131+
- _Tiling: {r: 1, g: 1, b: 0, a: 0}
132+
m_BuildTextureStacks: []

‎UOP1_Project/Assets/Art/Characters/Townsfolk_F/Townsfolk_Cerise.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.

0 commit comments

Comments
 (0)