Merge branch '3DBody' of http://git.zxkedu.com:33769/shenjianxing/VirtualFramework into 3DBody
This commit is contained in:
commit
5478b55371
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -25,7 +25,7 @@ RenderSettings:
|
||||
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
|
||||
m_AmbientIntensity: 2.356
|
||||
m_AmbientMode: 0
|
||||
m_SubtractiveShadowColor: {r: 0, g: 0.2830186, b: 1, a: 1}
|
||||
m_SubtractiveShadowColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_SkyboxMaterial: {fileID: 2100000, guid: 534150bfd1d0c6e4a8d54ab18eb47db8, type: 2}
|
||||
m_HaloStrength: 0.5
|
||||
m_FlareStrength: 1
|
||||
@ -6141,13 +6141,13 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 203844586}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
|
||||
m_LocalRotation: {x: 0.5279602, y: -0.21673603, z: 0.14146648, w: 0.80887}
|
||||
m_LocalPosition: {x: 0, y: 3, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
|
||||
m_LocalEulerAnglesHint: {x: 66.266, y: -30, z: 0}
|
||||
--- !u!1 &204198432 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: -521820879441198205, guid: 5755b628fc33efd4bb8984f770e4e884, type: 3}
|
||||
@ -29690,7 +29690,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!114 &1160234426
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user