gaiety/puzzle-jam-ii
gaiety/puzzle-jam-ii
1
0
Fork 0
Code Issues Pull requests Activity

Fixed intro animation for lasers

Browse source
This commit is contained in:
Ava Gaiety Wroten 2020-06-19 11:10:01 -05:00
parent 08be6bc77c
commit fafde7eb13
2 changed files with 66 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

156
Assets/Animations/Intro/Story-Animator.anim
View file

@ -114,17 +114,8 @@ AnimationClip:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 4.0833335
value: {x: -9.83, y: 5.04, z: 23.890944} value: {x: -9.83, y: 7.22, z: 23.890944}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 4.1
value: {x: -9.83, y: 5.04, z: 23.890944}
inSlope: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0 tangentMode: 0
@ -141,17 +132,8 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3 - serializedVersion: 3
time: 18.95 time: 18.8
value: {x: -9.83, y: 5.04, z: 23.890944} value: {x: -9.83, y: 7.22, z: 23.890944}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 20.283333
value: {x: -9.83, y: 5.04, z: 23.890944}
inSlope: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0 tangentMode: 0
@ -166,8 +148,17 @@ AnimationClip:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 4.1 time: 0
value: {x: 7.84, y: 4.52, z: 23.890944} value: {x: 10.55, y: 4.52, z: 23.890944}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 4.116667
value: {x: 10.55, y: 4.52, z: 23.890944}
inSlope: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0 tangentMode: 0
@ -184,8 +175,8 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3 - serializedVersion: 3
time: 18.766666 time: 18.733334
value: {x: 7.84, y: 4.52, z: 23.890944} value: {x: 10.55, y: 4.52, z: 23.890944}
inSlope: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0 tangentMode: 0
@ -1102,16 +1093,7 @@ AnimationClip:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 4.0833335
value: -9.83
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4.1
value: -9.83 value: -9.83
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
@ -1129,16 +1111,7 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 18.95 time: 18.8
value: -9.83
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 20.283333
value: -9.83 value: -9.83
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
@ -1157,17 +1130,8 @@ AnimationClip:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 4.0833335
value: 5.04 value: 7.22
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4.1
value: 5.04
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 136 tangentMode: 136
@ -1184,17 +1148,8 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 18.95 time: 18.8
value: 5.04 value: 7.22
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 20.283333
value: 5.04
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 136 tangentMode: 136
@ -1212,16 +1167,7 @@ AnimationClip:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 4.0833335
value: 23.890944
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4.1
value: 23.890944 value: 23.890944
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
@ -1239,16 +1185,7 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 18.95 time: 18.8
value: 23.890944
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 20.283333
value: 23.890944 value: 23.890944
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
@ -1267,8 +1204,17 @@ AnimationClip:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 4.1 time: 0
value: 7.84 value: 10.55
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4.116667
value: 10.55
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 136 tangentMode: 136
@ -1285,8 +1231,8 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 18.766666 time: 18.733334
value: 7.84 value: 10.55
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 136 tangentMode: 136
@ -1304,7 +1250,16 @@ AnimationClip:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 4.1 time: 0
value: 4.52
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4.116667
value: 4.52 value: 4.52
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
@ -1322,7 +1277,7 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 18.766666 time: 18.733334
value: 4.52 value: 4.52
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
@ -1341,7 +1296,16 @@ AnimationClip:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 4.1 time: 0
value: 23.890944
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4.116667
value: 23.890944 value: 23.890944
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
@ -1359,7 +1323,7 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 18.766666 time: 18.733334
value: 23.890944 value: 23.890944
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0

12
Assets/Scenes/Intro.unity
View file

@ -202,7 +202,7 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 16777215
m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
@ -560,7 +560,7 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 16777215
m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
@ -1225,7 +1225,7 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 16777215
m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
@ -1894,7 +1894,7 @@ PrefabInstance:
- target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 7 value: 9
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8,
type: 3} type: 3}
@ -2034,7 +2034,7 @@ Transform:
- {fileID: 16745508} - {fileID: 16745508}
- {fileID: 1276061842} - {fileID: 1276061842}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 9 m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &1187264637 --- !u!95 &1187264637
Animator: Animator:
@ -2212,7 +2212,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: 0} m_Father: {fileID: 0}
m_RootOrder: 8 m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1598451562 --- !u!1 &1598451562
GameObject: GameObject: