Ayud and Felfel looks

3 年前 · ba483324
--- a/UOP1_Project/Assets/Art/Accessories/Moustache/MoustacheBrown.mat
+++ b/UOP1_Project/Assets/Art/Accessories/Moustache/MoustacheBrown.mat
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: moustache
+  m_Name: MoustacheBrown
  m_Shader: {fileID: -6465566751694194690, guid: c2f57d091fa8e17459a737c31526637b,
    type: 3}
  m_ShaderKeywords: 
--- a/UOP1_Project/Assets/Art/Accessories/StrawOfHay/HayStraw_Texture.mat
+++ b/UOP1_Project/Assets/Art/Accessories/StrawOfHay/HayStraw_Texture.mat
    type: 3}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
+  m_EnableInstancingVariants: 1
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
  stringTagMap: {}
--- a/UOP1_Project/Assets/Art/Characters/Townsfolk_M/Townsfolk_Ayud.mat
+++ b/UOP1_Project/Assets/Art/Characters/Townsfolk_M/Townsfolk_Ayud.mat
    - _ZWrite: 1
    m_Colors:
    - Color_551FE3E8: {r: 1, g: 0.49595684, b: 0.49595684, a: 0}
-    - Color_5678DAF5: {r: 0.34539488, g: 0.4433962, b: 0.4401915, a: 0}
+    - Color_5678DAF5: {r: 0.42490974, g: 0.45964465, b: 0.5660378, a: 0}
    - Color_BD765EA0: {r: 0.6415094, g: 0.6415094, b: 0.6415094, a: 0}
    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
    - _Color: {r: 1, g: 1, b: 1, a: 1}
--- a/UOP1_Project/Assets/Art/Characters/Townsfolk_M/Townsfolk_Felfel.mat
+++ b/UOP1_Project/Assets/Art/Characters/Townsfolk_M/Townsfolk_Felfel.mat
    - _ZWrite: 1
    m_Colors:
    - Color_551FE3E8: {r: 0.2735849, g: 0.2735849, b: 0.2735849, a: 0}
-    - Color_5678DAF5: {r: 0.21698111, g: 0.21698111, b: 0.21698111, a: 0}
+    - Color_5678DAF5: {r: 0.254717, g: 0.254717, b: 0.254717, a: 0}
    - Color_BD765EA0: {r: 0.4433962, g: 0.311931, b: 0.311931, a: 0}
    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
    - _Color: {r: 1, g: 1, b: 1, a: 1}
--- a/UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/Ayud.prefab
+++ b/UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/Ayud.prefab
    - target: {fileID: 1132113797398714843, guid: 661c491ac76af4b429f8a8c0e6e8c762,
        type: 3}
      propertyPath: m_Lens.m_SensorSize.x
-      value: 1.7783554
+      value: 1.778039
      objectReference: {fileID: 0}
    - target: {fileID: 2803440263876833388, guid: 661c491ac76af4b429f8a8c0e6e8c762,
        type: 3}
    - target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: 1.2725528
+      value: 1.2725531
      objectReference: {fileID: 0}
    - target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
        type: 3}
    - target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
        type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0.035948653
+      value: 0.03594869
      objectReference: {fileID: 0}
    - target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
        type: 3}
    - target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
        type: 3}
      propertyPath: m_LocalRotation.z
-      value: 0.03348812
+      value: 0.033488136
      objectReference: {fileID: 0}
    - target: {fileID: 5579597578339563075, guid: 661c491ac76af4b429f8a8c0e6e8c762,
        type: 3}
    type: 3}
  m_PrefabInstance: {fileID: 267521092364063392}
  m_PrefabAsset: {fileID: 0}
+--- !u!4 &3498401952861897673 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3691472912802713961, guid: 661c491ac76af4b429f8a8c0e6e8c762,
+    type: 3}
+  m_PrefabInstance: {fileID: 267521092364063392}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1533371131138027829
 PrefabInstance:
  m_ObjectHideFlags: 0
    - target: {fileID: 3143522343821103927, guid: 0392be4dd75ff85428440a20f3fb1baa,
        type: 3}
      propertyPath: m_RootOrder
-      value: 12
+      value: 11
      objectReference: {fileID: 0}
    - target: {fileID: 3143522343821103927, guid: 0392be4dd75ff85428440a20f3fb1baa,
        type: 3}
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 0392be4dd75ff85428440a20f3fb1baa, type: 3}
--- !u!1001 &2194370440087143919
+--- !u!1001 &3032137743522899088
-    m_TransformParent: {fileID: 2164902606267540873}
+    m_TransformParent: {fileID: 3498401952861897673}
-    - target: {fileID: 3601518599378888090, guid: e09d6eae07e747f418676fe4e4acc0ca,
+    - target: {fileID: 4000410594485479123, guid: 3426336e4653388499cada9230475081,
-      value: Moustache
+      value: HayStraw
-    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+    - target: {fileID: 4381862322758777961, guid: 3426336e4653388499cada9230475081,
-      value: 11
-      objectReference: {fileID: 0}
-    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
-        type: 3}
-      propertyPath: m_LocalScale.x
-      value: 99.999985
-      objectReference: {fileID: 0}
-    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
-        type: 3}
-      propertyPath: m_LocalScale.y
-      value: 99.999985
+      value: 0
-    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
-        type: 3}
-      propertyPath: m_LocalScale.z
-      value: 99.999985
-      objectReference: {fileID: 0}
-    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+    - target: {fileID: 4381862322758777961, guid: 3426336e4653388499cada9230475081,
-      value: -0.023
+      value: 0.054
-    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+    - target: {fileID: 4381862322758777961, guid: 3426336e4653388499cada9230475081,
-      value: 0.292
+      value: 0.005
-    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+    - target: {fileID: 4381862322758777961, guid: 3426336e4653388499cada9230475081,
-      value: 0.002
+      value: -0.019
-    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+    - target: {fileID: 4381862322758777961, guid: 3426336e4653388499cada9230475081,
-      value: -0.007849206
+      value: 0.6936596
-    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+    - target: {fileID: 4381862322758777961, guid: 3426336e4653388499cada9230475081,
-      value: 0.6882114
+      value: 0.14260173
-    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+    - target: {fileID: 4381862322758777961, guid: 3426336e4653388499cada9230475081,
-      value: -0.0039805057
+      value: -0.69734114
-    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+    - target: {fileID: 4381862322758777961, guid: 3426336e4653388499cada9230475081,
-      value: -0.7254568
+      value: 0.11052803
-    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+    - target: {fileID: 4381862322758777961, guid: 3426336e4653388499cada9230475081,
-      value: 180.95
+      value: 20.609
-    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+    - target: {fileID: 4381862322758777961, guid: 3426336e4653388499cada9230475081,
-      value: 93.021
+      value: -90.81
-    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+    - target: {fileID: 4381862322758777961, guid: 3426336e4653388499cada9230475081,
-      value: -0.33898926
+      value: -2.789
-  m_SourcePrefab: {fileID: 100100000, guid: e09d6eae07e747f418676fe4e4acc0ca, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: 3426336e4653388499cada9230475081, type: 3}
 --- !u!1001 &5134495324099213723
 PrefabInstance:
  m_ObjectHideFlags: 0
    - target: {fileID: 63635585994123085, guid: f4bbe6c61a38d71448053046dfd3994c,
        type: 3}
      propertyPath: m_RootOrder
-      value: 13
+      value: 12
      objectReference: {fileID: 0}
    - target: {fileID: 63635585994123085, guid: f4bbe6c61a38d71448053046dfd3994c,
        type: 3}
--- a/UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/Felfel.prefab
+++ b/UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/Felfel.prefab
      propertyPath: m_LocalEulerAnglesHint.z
      value: 185.924
      objectReference: {fileID: 0}
+    - target: {fileID: 8695638194073742608, guid: f97d599fc80b11c48b91f5131eba3410,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 22956a738dc08a44f8e86f03a0ec497b, type: 2}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: f97d599fc80b11c48b91f5131eba3410, type: 3}
 --- !u!1001 &4585259009254694624
    type: 3}
  m_PrefabInstance: {fileID: 5089326855514228345}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &6288464019453417464
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 6565616831743406416}
+    m_Modifications:
+    - target: {fileID: 3097304900868981839, guid: e09d6eae07e747f418676fe4e4acc0ca,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 22956a738dc08a44f8e86f03a0ec497b, type: 2}
+    - target: {fileID: 3601518599378888090, guid: e09d6eae07e747f418676fe4e4acc0ca,
+        type: 3}
+      propertyPath: m_Name
+      value: Moustache
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 14
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 99.999985
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 99.999985
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 99.999985
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.023
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.292
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.002
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: -0.007849206
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.6882114
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.0039805057
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.7254568
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 180.95
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 93.021
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229155722664918816, guid: e09d6eae07e747f418676fe4e4acc0ca,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -0.33898926
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e09d6eae07e747f418676fe4e4acc0ca, type: 3}
 --- !u!1001 &8279385152103730152
 PrefabInstance:
  m_ObjectHideFlags: 0
      propertyPath: m_LocalEulerAnglesHint.z
      value: 2.646
      objectReference: {fileID: 0}
+    - target: {fileID: 4317584482294704216, guid: 0392be4dd75ff85428440a20f3fb1baa,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 22956a738dc08a44f8e86f03a0ec497b, type: 2}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 0392be4dd75ff85428440a20f3fb1baa, type: 3}
--- a/UOP1_Project/Assets/Art/Accessories/Moustache/MoustacheBlack.mat
+++ b/UOP1_Project/Assets/Art/Accessories/Moustache/MoustacheBlack.mat
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: MoustacheBlack
+  m_Shader: {fileID: -6465566751694194690, guid: c2f57d091fa8e17459a737c31526637b,
+    type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 1
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - Texture2D_4036A321:
+        m_Texture: {fileID: 2800000, guid: 8e508863ca9acdf4daeb1bcdd8e0221c, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTexture:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecularMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AlphaClip: 0
+    - _Blend: 0
+    - _BumpScale: 1
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DstBlend: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _LightProbeContribution: 3.5
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _OutlineDepthSensitivity: 0.5
+    - _OutlineNormalsSensitivity: 0.5
+    - _OutlineThickness: 0
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Surface: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - Color_551FE3E8: {r: 0, g: 0, b: 0, a: 0}
+    - Color_5678DAF5: {r: 1, g: 1, b: 1, a: 0}
+    - Color_BD765EA0: {r: 0.103773594, g: 0.103773594, b: 0.103773594, a: 0}
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _MainColor: {r: 1, g: 1, b: 1, a: 0}
+    - _Offset: {r: 0, g: 0, b: 0, a: 0}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+    - _SpecularColor: {r: 0, g: 0, b: 0, a: 0}
+    - _Tiling: {r: 1, g: 1, b: 0, a: 0}
+  m_BuildTextureStacks: []
+--- !u!114 &7079221975417235924
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 2
--- a/UOP1_Project/Assets/Art/Accessories/Moustache/MoustacheBlack.mat.meta
+++ b/UOP1_Project/Assets/Art/Accessories/Moustache/MoustacheBlack.mat.meta
+fileFormatVersion: 2
+guid: 22956a738dc08a44f8e86f03a0ec497b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a//UOP1_Project/Assets/Art/Accessories/Moustache/MoustacheBrown.mat.meta
+++ b//UOP1_Project/Assets/Art/Accessories/Moustache/MoustacheBrown.mat.meta
--- a//UOP1_Project/Assets/Art/Accessories/Moustache/MoustacheBrown.mat
+++ b//UOP1_Project/Assets/Art/Accessories/Moustache/MoustacheBrown.mat