Merge remote-tracking branch 'origin/Player-Animation' into weapons-without-scriptableobjects

This commit is contained in:
Noah4ever
2021-11-09 11:18:16 +01:00
12 changed files with 594 additions and 449 deletions

View File

@@ -1045,7 +1045,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4636852677861728911, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4636852677968575729, guid: e4f2c82228df5bc4f8fc674e98c7275b, type: 3}
propertyPath: m_text