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,12 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Scenes/Shumpei/MenuScene.unity.meta
guid: 8eb805c8ac3b6ff41a6002372d160f1f
========
guid: 7132a8e595d20114aa50d2f143f253d0
folderAsset: yes
>>>>>>>> origin/slimeAI:Assets/Project Files/Animations/Arlo.meta
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7862259c182c7f0488c1e8a56b2d0ae7
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant: