Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
accepted merging
  • Loading branch information
Tianzhu Zhang authored and Tianzhu Zhang committed Oct 8, 2013
2 parents 946eb8e + 8816859 commit e2cefa8
Show file tree
Hide file tree
Showing 8 changed files with 785 additions and 2,038 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

@@ -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: {}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

@@ -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}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Expand Up @@ -160,7 +160,11 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100006}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
<<<<<<< HEAD
m_LocalPosition: {x: 0, y: 0, z: 0}
=======
m_LocalPosition: {x: -12.1633101, y: -.761309385, z: -14.8013258}
>>>>>>> 88168598c5e251228e65a17cd9043e6435ee0e86
m_LocalScale: {x: 1, y: 1, z: -1}
m_Children:
- {fileID: 400012}
Expand Down Expand Up @@ -303,7 +307,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 2100000, guid: 310c8e2149015e64c95ead8c81ab98b9, type: 2}
- {fileID: 2100000, guid: a5a6a0a32eb3cbc4eb08b50163c6d066, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 1
Expand Down

0 comments on commit e2cefa8

Please sign in to comment.