Skip to content

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

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

# Conflicts:
#	UnityGitTest/Assets/_Scene/场景测试.unity
parents 61e0c443 453f0d15
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
UnityGitTest/Assets/_Scene/场景测试.unity
View file @ dc440b6b
...@@ -38,7 +38,7 @@ RenderSettings: ...@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641252, b: 0.574817, a: 1}
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -141,7 +141,8 @@ Transform: ...@@ -141,7 +141,8 @@ Transform:
m_LocalRotation: {x: 0.026843984, y: 0.02547399, z: 0.025473988, w: 0.9989903} m_LocalRotation: {x: 0.026843984, y: 0.02547399, z: 0.025473988, w: 0.9989903}
m_LocalPosition: {x: 5.440071, y: 2.0848312, z: -3.7126212} m_LocalPosition: {x: 5.440071, y: 2.0848312, z: -3.7126212}
m_LocalScale: {x: 2, y: 2, z: 2} m_LocalScale: {x: 2, y: 2, z: 2}
m_Children: [] m_Children:
- {fileID: 1695846285}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 3, y: 3, z: 3} m_LocalEulerAnglesHint: {x: 3, y: 3, z: 3}
...@@ -307,7 +308,7 @@ MonoBehaviour: ...@@ -307,7 +308,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: 111111 inttes: 8888
--- !u!1 &1301340026 --- !u!1 &1301340026
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -513,7 +514,6 @@ Transform: ...@@ -513,7 +514,6 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 1301340027} - {fileID: 1301340027}
- {fileID: 1695846285}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -538,14 +538,14 @@ Transform: ...@@ -538,14 +538,14 @@ Transform:
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
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.026843984, y: -0.02547399, z: -0.025473988, w: 0.9989903}
m_LocalPosition: {x: 2.440071, y: -1.9151688, z: 3.2873788} m_LocalPosition: {x: -1.5002095, y: -1.5039954, z: -1.4957839}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.49999997, y: 0.5, z: 0.49999997}
m_Children: m_Children:
- {fileID: 1215538767} - {fileID: 1215538767}
- {fileID: 1477395965} - {fileID: 1477395965}
m_Father: {fileID: 1576516088} m_Father: {fileID: 1041265099}
m_RootOrder: 1 m_RootOrder: 0
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