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

9e19475c · 林杨欢 · a3b4a98e · d07cff2e · 9e19475c · 9e19475c
Commit 9e19475c authored Nov 22, 2018 by 林杨欢
9 changed files
--- a/.DS_Store
+++ b/.DS_Store
--- a/UnityGitTest/.DS_Store
+++ b/UnityGitTest/.DS_Store
--- a/UnityGitTest/Assets/.DS_Store
+++ b/UnityGitTest/Assets/.DS_Store
--- a/UnityGitTest/Assets/_Scene/.DS_Store
+++ b/UnityGitTest/Assets/_Scene/.DS_Store
--- a/UnityGitTest/Assets/_Scene/mater2/.DS_Store
+++ b/UnityGitTest/Assets/_Scene/mater2/.DS_Store
--- a/UnityGitTest/Assets/_Scene/mater2/Material/.DS_Store
+++ b/UnityGitTest/Assets/_Scene/mater2/Material/.DS_Store
--- a/UnityGitTest/Assets/_Scene/mater2/Material/组件材质.mat
+++ b/UnityGitTest/Assets/_Scene/mater2/Material/组件材质.mat
--- a/UnityGitTest/Assets/_Scene/mater2/Material/组件材质.mat.meta
+++ b/UnityGitTest/Assets/_Scene/mater2/Material/组件材质.mat.meta
 fileFormatVersion: 2
-guid: 47ab96a56186d9d4dbf883ff6825cc5f
-timeCreated: 1541570688
-licenseType: Free
+guid: e5690486cf25f4f56be79f0e84c88a6e
+timeCreated: 1542863300
+licenseType: Pro
 NativeFormatImporter:
  externalObjects: {}
-  mainObjectFileID: 2100000
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/UnityGitTest/Assets/_Scene/场景测试.unity
+++ b/UnityGitTest/Assets/_Scene/场景测试.unity
@@ -328,7 +328,7 @@ MeshRenderer:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 47ab96a56186d9d4dbf883ff6825cc5f, type: 2}
+  - {fileID: 2100000, guid: e5690486cf25f4f56be79f0e84c88a6e, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0