Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
accepted merging
- Loading branch information
Showing
8 changed files
with
785 additions
and
2,038 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
...s/Game Spirtes/Baddies/Water Baddie/Back/Parts/Flower_Baddie_0003_Layer-1-copy-4.png.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
5 changes: 5 additions & 0 deletions
5
Guardian of Silverkeep/Assets/Game Spirtes/Baddies/Water Baddie/Back/Parts/Materials.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
23 changes: 23 additions & 0 deletions
23
...e Spirtes/Baddies/Water Baddie/Back/Parts/Materials/Flower_Baddie_0003_Layer-1-copy-4.mat
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
%YAML 1.1 | ||
%TAG !u! tag:unity3d.com,2011: | ||
--- !u!21 &2100000 | ||
Material: | ||
serializedVersion: 3 | ||
m_ObjectHideFlags: 0 | ||
m_PrefabParentObject: {fileID: 0} | ||
m_PrefabInternal: {fileID: 0} | ||
m_Name: Flower_Baddie_0003_Layer-1-copy-4 | ||
m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} | ||
m_ShaderKeywords: [] | ||
m_SavedProperties: | ||
serializedVersion: 2 | ||
m_TexEnvs: | ||
data: | ||
first: | ||
name: _MainTex | ||
second: | ||
m_Texture: {fileID: 2800000, guid: b0ba75d08fe0fde428b83451a8a594f4, type: 3} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
m_Floats: {} | ||
m_Colors: {} |
4 changes: 4 additions & 0 deletions
4
...rtes/Baddies/Water Baddie/Back/Parts/Materials/Flower_Baddie_0003_Layer-1-copy-4.mat.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
27 changes: 27 additions & 0 deletions
27
...sets/Game Spirtes/Baddies/Water Baddie/Front/Parts/Materials/Flower_Baddie_0005_bot 1.mat
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
%YAML 1.1 | ||
%TAG !u! tag:unity3d.com,2011: | ||
--- !u!21 &2100000 | ||
Material: | ||
serializedVersion: 3 | ||
m_ObjectHideFlags: 0 | ||
m_PrefabParentObject: {fileID: 0} | ||
m_PrefabInternal: {fileID: 0} | ||
m_Name: Flower_Baddie_0005_bot 1 | ||
m_Shader: {fileID: 30, guid: 0000000000000000f000000000000000, type: 0} | ||
m_ShaderKeywords: [] | ||
m_SavedProperties: | ||
serializedVersion: 2 | ||
m_TexEnvs: | ||
data: | ||
first: | ||
name: _MainTex | ||
second: | ||
m_Texture: {fileID: 2800000, guid: b5832cfc1a28bad49a6a4c51b776563e, type: 3} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
m_Floats: {} | ||
m_Colors: | ||
data: | ||
first: | ||
name: _Color | ||
second: {r: 1, g: 1, b: 1, a: 1} |
4 changes: 4 additions & 0 deletions
4
...Game Spirtes/Baddies/Water Baddie/Front/Parts/Materials/Flower_Baddie_0005_bot 1.mat.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.