diff options
author | chai <chaifix@163.com> | 2020-11-20 21:12:42 +0800 |
---|---|---|
committer | chai <chaifix@163.com> | 2020-11-20 21:12:42 +0800 |
commit | 152c56a5b706a22993388786586cb4ee3b423577 (patch) | |
tree | d2e14e3e151160238abb8e6fcbfe800580ad5388 /Assets/Art/Models/Characters/WalkRobot/source/Materials.meta | |
parent | 7c06559f1e8949d1ceed4cb3474c272ae0e1a27b (diff) | |
parent | 53ff454d20a1480069f5cde82b525c82c47d1362 (diff) |
Merge branch 'master' of warmcat.org:/home/git-repo/Erika
# Conflicts:
# Assets/Art/Models/Characters/Robots_Prowler.meta
# Assets/Art/Models/Characters/Robots_Prowler/Materials.meta
# Assets/Art/Models/Characters/Robots_Prowler/prefab.meta
Diffstat (limited to 'Assets/Art/Models/Characters/WalkRobot/source/Materials.meta')
-rw-r--r-- | Assets/Art/Models/Characters/WalkRobot/source/Materials.meta | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Assets/Art/Models/Characters/WalkRobot/source/Materials.meta b/Assets/Art/Models/Characters/WalkRobot/source/Materials.meta new file mode 100644 index 00000000..b7c382cd --- /dev/null +++ b/Assets/Art/Models/Characters/WalkRobot/source/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 02392d9d7ddd7be4cb2b9b28debd71f2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: |