merge arlo

This commit is contained in:
HelarJ
2022-04-11 19:13:05 +03:00
79 changed files with 7072 additions and 12 deletions

View File

@@ -0,0 +1,13 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/RECURSOS YOS UNITY.meta
guid: 28785ec045ec00946ab767b14c8f4c6d
folderAsset: yes
DefaultImporter:
========
guid: 288eb0a3190dc75419059ff7b4b70aa0
PrefabImporter:
>>>>>>>> origin/slimeAI:Assets/Project Files/Prefabs/Arlo/SlimePBR.prefab.meta
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: