Commit 01864399 authored by Yuyang's avatar Yuyang

Merge remote-tracking branch 'origin/master' into Yuy

parents 6c9e7a11 accc0b1b
......@@ -67686,7 +67686,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5244471681496118822}
m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
m_Children:
......@@ -67697,7 +67697,7 @@ Transform:
- {fileID: 3242446049856155242}
m_Father: {fileID: 5143472178291914392}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &2843108052282128534
Animator:
serializedVersion: 3
......@@ -91606,7 +91606,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7556719735835612004}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 4.24, z: 0}
m_LocalPosition: {x: 0, y: 4, z: 0}
m_LocalScale: {x: 3.06, y: 0.01, z: 1.7}
m_Children: []
m_Father: {fileID: 4151723301425752805}
......@@ -108795,7 +108795,7 @@ MonoBehaviour:
cachedMesh: {fileID: 993419639201786619, guid: 5cf58c6137fac2d4694d7c32c4b1b4be,
type: 3}
InvisibleUpdate: 0
readable: 1
readable: 0
--- !u!114 &6992544829660256268
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -18954,7 +18954,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1566743486241249871}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 4.84, z: -0.51}
m_LocalPosition: {x: 0, y: 4, z: 0}
m_LocalScale: {x: 3.06, y: 0.01, z: 2}
m_Children: []
m_Father: {fileID: 4971145158126658510}
......@@ -62742,7 +62742,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5930954319460512190}
m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
m_Children:
......@@ -62753,7 +62753,7 @@ Transform:
- {fileID: 2005704845593694761}
m_Father: {fileID: 4179803106819375027}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &157537422146586657
Animator:
serializedVersion: 3
......@@ -75181,7 +75181,7 @@ MonoBehaviour:
cachedMesh: {fileID: 993419639201786619, guid: 5cf58c6137fac2d4694d7c32c4b1b4be,
type: 3}
InvisibleUpdate: 0
readable: 1
readable: 0
--- !u!114 &4242225219000657087
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -103409,7 +103409,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8393016391328045342}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 2.21, z: -0.51}
m_LocalPosition: {x: 0, y: 1.41, z: 0}
m_LocalScale: {x: 3.06, y: 4.5, z: 2}
m_Children: []
m_Father: {fileID: 4971145158126658510}
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