Skip to content

G
GitTestMainProject
Commit c1383c4a authored by 林杨欢's avatar 林杨欢
Browse files
Options

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

# Conflicts:
#	UnityGitTest/Assets/_Scene/场景测试.unity
parents 76ebe049 c564a000
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
UnityGitTest/Assets/_Scene/场景测试.unity
View file @ c1383c4a
...@@ -241,7 +241,7 @@ Transform: ...@@ -241,7 +241,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1695846285} m_Father: {fileID: 1695846285}
m_RootOrder: 0 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &1215538768 --- !u!23 &1215538768
MeshRenderer: MeshRenderer:
...@@ -329,14 +329,13 @@ Transform: ...@@ -329,14 +329,13 @@ Transform:
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1301340026} m_GameObject: {fileID: 1301340026}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.440071, y: -0.91516876, z: -6.712621} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 2066454305} - {fileID: 2066454305}
- {fileID: 1695846285} m_Father: {fileID: 1695846285}
m_Father: {fileID: 0} m_RootOrder: 0
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1477395964 --- !u!1 &1477395964
GameObject: GameObject:
...@@ -368,7 +367,7 @@ Transform: ...@@ -368,7 +367,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1695846285} m_Father: {fileID: 1695846285}
m_RootOrder: 1 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &1477395966 --- !u!23 &1477395966
MeshRenderer: MeshRenderer:
...@@ -434,7 +433,7 @@ MonoBehaviour: ...@@ -434,7 +433,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9c32ae0af27e1c44faa6d5d28255942c, type: 3} m_Script: {fileID: 11500000, guid: 9c32ae0af27e1c44faa6d5d28255942c, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
inttes: 8 inttes: 111
--- !u!1 &1576516084 --- !u!1 &1576516084
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -538,13 +537,14 @@ Transform: ...@@ -538,13 +537,14 @@ Transform:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1695846284} m_GameObject: {fileID: 1695846284}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 2.440071, y: -0.91516876, z: -6.712621}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 1301340027}
- {fileID: 1215538767} - {fileID: 1215538767}
- {fileID: 1477395965} - {fileID: 1477395965}
m_Father: {fileID: 1301340027} m_Father: {fileID: 0}
m_RootOrder: 1 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1760352835 --- !u!1 &1760352835
GameObject: GameObject:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment