Commit b4637d4e authored by wanqing's avatar wanqing

Merge remote-tracking branch 'origin/Yuy'

# Conflicts:
#	Storage/Assets/Res/Levels/Level8.prefab
#	Storage/Assets/Res/Levels/Level9.prefab
parents 9aed172b 2997a09a
...@@ -734,34 +734,6 @@ AnimationClip: ...@@ -734,34 +734,6 @@ AnimationClip:
path: "\u7279\u6548/\u95ED\u5408\u7279\u6548" path: "\u7279\u6548/\u95ED\u5408\u7279\u6548"
classID: 1 classID: 1
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.083333336
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Case01/Push2
classID: 1
script: {fileID: 0}
m_PPtrCurves: m_PPtrCurves:
- curve: - curve:
- time: 1.8333334 - time: 1.8333334
...@@ -872,13 +844,6 @@ AnimationClip: ...@@ -872,13 +844,6 @@ AnimationClip:
typeID: 1 typeID: 1
customType: 0 customType: 0
isPPtrCurve: 0 isPPtrCurve: 0
- serializedVersion: 2
path: 2355995612
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2 - serializedVersion: 2
path: 4240414707 path: 4240414707
attribute: 4 attribute: 4
...@@ -2428,34 +2393,6 @@ AnimationClip: ...@@ -2428,34 +2393,6 @@ AnimationClip:
path: "\u7279\u6548/\u95ED\u5408\u7279\u6548" path: "\u7279\u6548/\u95ED\u5408\u7279\u6548"
classID: 1 classID: 1
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.083333336
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Case01/Push2
classID: 1
script: {fileID: 0}
- curve: - curve:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
......
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