ktyl
/
revival
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'door-and-arrows' into main

This commit is contained in:
Cat Flynn 2021-05-18 22:12:36 +01:00
parent 96f0fd8fff 7f390d12f3
commit 5f35e1ec9c
2 changed files with 24 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
game/Assets/Prefabs/Puzzles/Boost/boost_gauntlet.prefab
View File

@ -19342,19 +19342,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5240851486570782915, guid: 55fadb9f11c9ea74fb586631ce45bd14, type: 3}
propertyPath: m_LocalScale.x
value: 5.06
value: 5.72874
objectReference: {fileID: 0}
- target: {fileID: 5240851486570782915, guid: 55fadb9f11c9ea74fb586631ce45bd14, type: 3}
propertyPath: m_LocalScale.z
value: 2.356725
value: 2.132129
objectReference: {fileID: 0}
- target: {fileID: 5240851486570782915, guid: 55fadb9f11c9ea74fb586631ce45bd14, type: 3}
propertyPath: m_LocalPosition.x
value: -0
value: -0.0553
objectReference: {fileID: 0}
- target: {fileID: 5240851486570782915, guid: 55fadb9f11c9ea74fb586631ce45bd14, type: 3}
propertyPath: m_LocalPosition.z
value: 0.203
value: 0.048
objectReference: {fileID: 0}
- target: {fileID: 6149521019687114910, guid: 55fadb9f11c9ea74fb586631ce45bd14, type: 3}
propertyPath: _playerExit.m_PersistentCalls.m_Calls.Array.size

52
game/Assets/Scenes/Main.unity
View File

@ -2016,15 +2016,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: -0.012675026
value: -0.012674963
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.002542086
value: 0.0025421008
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.0141892135
value: 0.014189146
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223330, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_RendererIndex
@ -2048,19 +2048,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: -0.1483958
value: -0.14839591
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.12172758
value: 0.12172762
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.75878316
value: 0.7587832
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.6224221
value: 0.622422
objectReference: {fileID: 0}
- target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_Name
@ -2156,31 +2156,31 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: 0.05179537
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
value: 0.3519076
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.z
value: 0.96477157
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: 0.30979636
value: 0.9729518
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.9384341
value: 0.1731979
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: -0.15159637
value: -0.054724786
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: -0.019650025
value: -0.14273255
objectReference: {fileID: 0}
- target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
@ -2228,19 +2228,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: 0.9948909
value: 0.99489087
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.0707499
value: 0.07075005
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: -0.018580286
value: -0.018580293
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: -0.06957952
value: -0.069579504
objectReference: {fileID: 0}
- target: {fileID: 4676633833077728950, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_XAxis.Value
@ -2284,11 +2284,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: -0.14839587
value: -0.14839591
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.12172759
value: 0.12172762
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
@ -3070,10 +3070,6 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 25
objectReference: {fileID: 0}
- target: {fileID: 617695716942238125, guid: 2d949926f63a2554584336b07085202b, type: 3}
propertyPath: m_LocalPosition.z
value: -0.26
objectReference: {fileID: 0}
- target: {fileID: 888756925687827035, guid: 2d949926f63a2554584336b07085202b, type: 3}
propertyPath: m_RootOrder
value: 29
@ -3286,14 +3282,6 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 24
objectReference: {fileID: 0}
- target: {fileID: 7337296876544949150, guid: 2d949926f63a2554584336b07085202b, type: 3}
propertyPath: m_LocalPosition.x
value: -0.2
objectReference: {fileID: 0}
- target: {fileID: 7337296876544949150, guid: 2d949926f63a2554584336b07085202b, type: 3}
propertyPath: m_LocalPosition.z
value: 1.37
objectReference: {fileID: 0}
- target: {fileID: 7710948611258593327, guid: 2d949926f63a2554584336b07085202b, type: 3}
propertyPath: _onPress.m_PersistentCalls.m_Calls.Array.size
value: 1