Merge branch 'NewStory' of http://185.56.209.148/beyond/beyond into NewStory
This commit is contained in:
@@ -15,7 +15,7 @@ MonoBehaviour:
|
||||
m_DefaultGroup: bc074d00982114f0388e9c98de91d44f
|
||||
m_currentHash:
|
||||
serializedVersion: 2
|
||||
Hash: 00000000000000000000000000000000
|
||||
Hash: ef672e941747c2eb6b19db828d740a6a
|
||||
m_OptimizeCatalogSize: 0
|
||||
m_BuildRemoteCatalog: 0
|
||||
m_CatalogRequestsTimeout: 0
|
||||
|
||||
@@ -174,7 +174,7 @@ Material:
|
||||
- BaseColor: {r: 0.8207547, g: 0.8207547, b: 0.8207547, a: 1}
|
||||
- Color_613d1588816440ec9b17710effb7528b: {r: 0, g: 13.98681, b: 714.8679, a: 0}
|
||||
- EmissiveColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
- _BaseColor: {r: 0.5566038, g: 0.5566038, b: 0.5566038, a: 1}
|
||||
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _BendVector: {r: 0, g: -1, b: 0, a: 0}
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user