Merge remote-tracking branch 'origin/NewStory' into NewStory

# Conflicts: # Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Adam_body_Metal.mat # Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Adam_head_metal.mat # Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Bow.mat # Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Eva_Body_Metal.mat # Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Eva_Head_Metal.mat
2025-09-13 19:10:55 +02:00
parent 187674abfe 8fadab05e8
commit ed9d1eefbb
45 changed files with 7217 additions and 2671 deletions
--- a/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Adam_body_Metal.mat
+++ b/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Adam_body_Metal.mat
@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-3625974168367842241
+--- !u!114 &-4038453504596325930
 MonoBehaviour:
  m_ObjectHideFlags: 11
  m_CorrespondingSourceObject: {fileID: 0}
--- a/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Adam_head_metal.mat
+++ b/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Adam_head_metal.mat
@@ -134,7 +134,7 @@ Material:
    - _SpecColor: {r: 0.625, g: 0.7206896, b: 1, a: 1}
  m_BuildTextureStacks: []
  m_AllowLocking: 1
--- !u!114 &1114542027491659141
+--- !u!114 &5618362483761361914
 MonoBehaviour:
  m_ObjectHideFlags: 11
  m_CorrespondingSourceObject: {fileID: 0}
--- a/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Bow.mat
+++ b/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Bow.mat
@@ -129,7 +129,7 @@ Material:
    - _SpecColor: {r: 0.8602941, g: 0.89594316, b: 1, a: 1}
  m_BuildTextureStacks: []
  m_AllowLocking: 1
--- !u!114 &3248454389675638324
+--- !u!114 &6956751399976171411
 MonoBehaviour:
  m_ObjectHideFlags: 11
  m_CorrespondingSourceObject: {fileID: 0}
--- a/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Eva_Body_Metal.mat
+++ b/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Eva_Body_Metal.mat
@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-3687339755134204407
+--- !u!114 &-7691346883607124648
 MonoBehaviour:
  m_ObjectHideFlags: 11
  m_CorrespondingSourceObject: {fileID: 0}
--- a/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Eva_Head_Metal.mat
+++ b/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Eva_Head_Metal.mat
@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-7174681138944601437
+--- !u!114 &-4499385966301197659
 MonoBehaviour:
  m_ObjectHideFlags: 11
  m_CorrespondingSourceObject: {fileID: 0}
--- a/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Helmet.mat
+++ b/Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Helmet.mat
@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-1019187969406195858
+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: 10
 --- !u!21 &2100000
 Material:
  serializedVersion: 8