Merge branch 'master' of gitlab.sd-zeus.com:linyanghuan/git_test

# Conflicts:
#	UnityGitTest/Assets/_Scene/场景测试.unity

.gitignore

+*.DS_Store

UnityGitTest/Assets/Scripts/test.meta → UnityGitTest/Assets/Scripts/mater2/test.meta

 fileFormatVersion: 2
-guid: 3442a285cc04b6943bd51df29ec6ad42
+guid: a87974591cb064e15bf695e9cacab731
 folderAsset: yes
-timeCreated: 1542865747
-licenseType: Free
+timeCreated: 1542866157
+licenseType: Pro
 DefaultImporter:
   externalObjects: {}
   userData: 

UnityGitTest/Assets/Scripts/test/组件材质.mat.meta → UnityGitTest/Assets/Scripts/mater2/组件材质.mat.meta

 fileFormatVersion: 2
 guid: e5690486cf25f4f56be79f0e84c88a6e
-timeCreated: 1542863300
+timeCreated: 1542866127
 licenseType: Pro
 NativeFormatImporter:
   externalObjects: {}

UnityGitTest/Assets/_Scene/mater2/Material.meta

-fileFormatVersion: 2
-guid: 492030d56f9fa3c4fa65ccccdc813008
-folderAsset: yes
-timeCreated: 1541570649
-licenseType: Free
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: