diff --git a/Assets/Resources/Games/builtToScaleRvl.prefab b/Assets/Resources/Games/builtToScaleRvl.prefab index 0ab693adf..02dda5070 100644 --- a/Assets/Resources/Games/builtToScaleRvl.prefab +++ b/Assets/Resources/Games/builtToScaleRvl.prefab @@ -1091,7 +1091,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 4.67, y: 2.25} + m_Size: {x: 8, y: 8} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1315,7 +1315,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &6137499710566233010 Transform: m_ObjectHideFlags: 0 @@ -1419,7 +1419,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 4.67, y: 2.25} + m_Size: {x: 8, y: 8} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1658,7 +1658,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1327125824545584460 Transform: m_ObjectHideFlags: 0 @@ -2021,7 +2021,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &8078835494031887749 Transform: m_ObjectHideFlags: 0 @@ -3904,10 +3904,6 @@ PrefabInstance: propertyPath: m_Name value: whiteblock (1) objectReference: {fileID: 0} - - target: {fileID: 876647762485842733, guid: 7f6c0a32ae05cc9499e4e8fe2c729bbb, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 3636702461004627844, guid: 7f6c0a32ae05cc9499e4e8fe2c729bbb, type: 3} propertyPath: m_RootOrder value: 0 diff --git a/Assets/Resources/Prefabs/Games/BuiltToScaleRvl/whiteblock.prefab b/Assets/Resources/Prefabs/Games/BuiltToScaleRvl/whiteblock.prefab index 1386b0b6a..65e69ba89 100644 --- a/Assets/Resources/Prefabs/Games/BuiltToScaleRvl/whiteblock.prefab +++ b/Assets/Resources/Prefabs/Games/BuiltToScaleRvl/whiteblock.prefab @@ -491,8 +491,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: position: 0 - isOpen: 0 - isPrepare: 0 + _slideOffset: -10 --- !u!1 &1305944185207812440 GameObject: m_ObjectHideFlags: 0 @@ -983,7 +982,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3105322802863806295} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.975, y: -0.973, z: 0} + m_LocalPosition: {x: 1.2, y: -1.235, z: 0} m_LocalScale: {x: 0.2625, y: 0.2625, z: 0.2625} m_ConstrainProportionsScale: 1 m_Children: [] @@ -1355,7 +1354,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4245557345836407682} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.435, y: -1.464, z: 0} + m_LocalPosition: {x: 1.435, y: -1.465, z: 0} m_LocalScale: {x: 0.2625, y: 0.2625, z: 0.2625} m_ConstrainProportionsScale: 1 m_Children: [] @@ -1439,7 +1438,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4380893917095160066} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.56, y: -0.591, z: 0} + m_LocalPosition: {x: 0.531, y: -0.568, z: 0} m_LocalScale: {x: 0.2625, y: 0.2625, z: 0.2625} m_ConstrainProportionsScale: 1 m_Children: [] @@ -2111,7 +2110,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6118360740419522931} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.029, y: 0.014, z: 0} + m_LocalPosition: {x: -0.02, y: 0.026, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -2411,7 +2410,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6920996817797565861} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.786, y: -0.802, z: 0} + m_LocalPosition: {x: 0.87, y: -0.906, z: 0} m_LocalScale: {x: 0.2625, y: 0.2625, z: 0.2625} m_ConstrainProportionsScale: 1 m_Children: [] @@ -2938,7 +2937,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8763923828948703203} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.312, y: -1.348, z: 0} + m_LocalPosition: {x: 1.312, y: -1.347, z: 0} m_LocalScale: {x: 0.2625, y: 0.2625, z: 0.2625} m_ConstrainProportionsScale: 1 m_Children: [] diff --git a/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/assembled.controller b/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/assembled.controller index 3e54dff98..e993e1af4 100644 --- a/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/assembled.controller +++ b/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/assembled.controller @@ -52,7 +52,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: assembled - m_Speed: 1 + m_Speed: 2 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] diff --git a/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/blockidle.anim b/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/block_idle.anim similarity index 99% rename from Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/blockidle.anim rename to Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/block_idle.anim index 729c348a4..ccfefd6a2 100644 --- a/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/blockidle.anim +++ b/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/block_idle.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: blockidle + m_Name: block_idle serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 @@ -381,7 +381,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/blockidle.anim.meta b/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/block_idle.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/blockidle.anim.meta rename to Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/block_idle.anim.meta diff --git a/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/block_miss_open.anim b/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/block_miss_open.anim index b271b9756..6b0528c7e 100644 --- a/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/block_miss_open.anim +++ b/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/block_miss_open.anim @@ -492,7 +492,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/square.controller b/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/square.controller index 4cee52271..217be29f9 100644 --- a/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/square.controller +++ b/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/square.controller @@ -60,7 +60,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: right - m_Speed: 1.5 + m_Speed: 2 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -139,7 +139,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: left - m_Speed: 1.5 + m_Speed: 2 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] diff --git a/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/square_left.anim b/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/square_left.anim index 56b964bcf..f43180f59 100644 --- a/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/square_left.anim +++ b/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/square_left.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1.0680001, y: -0.20499992, z: 0} + value: {x: 0.018, y: -0.555, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.033333335 - value: {x: 0.876, y: -0.363, z: 0} + value: {x: -0.174, y: -0.713, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -38,7 +38,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.06666667 - value: {x: 0.759, y: -0.409, z: 0} + value: {x: -0.291, y: -0.759, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -47,7 +47,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.1 - value: {x: 0.588, y: -0.468, z: 0} + value: {x: -0.462, y: -0.818, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -56,7 +56,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.13333334 - value: {x: 0.532, y: -0.491, z: 0} + value: {x: -0.518, y: -0.841, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -65,7 +65,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.2 - value: {x: 0.404, y: -0.525, z: 0} + value: {x: -0.646, y: -0.875, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -74,7 +74,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.26666668 - value: {x: 0.24, y: -0.58, z: 0} + value: {x: -0.81, y: -0.93, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -83,7 +83,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.36666667 - value: {x: 0.079, y: -0.625, z: 0} + value: {x: -0.971, y: -0.975, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -92,7 +92,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.46666667 - value: {x: 0.079, y: -0.625, z: 0} + value: {x: -0.971, y: -0.975, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -101,7 +101,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6 - value: {x: 0.079, y: -0.625, z: 0} + value: {x: -0.971, y: -0.975, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -117,7 +117,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1.029, y: 0.341, z: 0} + value: {x: -0.021, y: -0.009, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -126,7 +126,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.033333335 - value: {x: 0.827, y: 0.396, z: 0} + value: {x: -0.223, y: 0.046, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -135,7 +135,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.06666667 - value: {x: 0.749, y: 0.403, z: 0} + value: {x: -0.301, y: 0.053, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -144,7 +144,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.1 - value: {x: 0.622, y: 0.392, z: 0} + value: {x: -0.428, y: 0.042, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -153,7 +153,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.13333334 - value: {x: 0.511, y: 0.358, z: 0} + value: {x: -0.539, y: 0.008, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -162,7 +162,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.2 - value: {x: 0.356, y: 0.314, z: 0} + value: {x: -0.694, y: -0.036, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -171,7 +171,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.26666668 - value: {x: 0.241, y: 0.2345, z: 0} + value: {x: -0.809, y: -0.1155, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -180,7 +180,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.36666667 - value: {x: 0.184, y: 0.189, z: 0} + value: {x: -0.866, y: -0.161, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -189,7 +189,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.46666667 - value: {x: 0.114, y: 0.119, z: 0} + value: {x: -0.936, y: -0.231, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -198,7 +198,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6 - value: {x: 0.114, y: 0.119, z: 0} + value: {x: -0.936, y: -0.231, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -343,9 +343,9 @@ AnimationClip: - time: 0.033333335 value: {fileID: 356430700, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - time: 0.06666667 - value: {fileID: -4190599202341174402, guid: f77716464d1f0864fbad93cdacd39630, type: 3} + value: {fileID: 3636556212256844352, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - time: 0.1 - value: {fileID: 4881183030622861663, guid: f77716464d1f0864fbad93cdacd39630, type: 3} + value: {fileID: -8642681091945623821, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - time: 0.13333334 value: {fileID: 444922917, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - time: 0.2 @@ -417,8 +417,8 @@ AnimationClip: - {fileID: 956981337, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - {fileID: -1667867877, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - {fileID: 356430700, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - - {fileID: -4190599202341174402, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - - {fileID: 4881183030622861663, guid: f77716464d1f0864fbad93cdacd39630, type: 3} + - {fileID: 3636556212256844352, guid: f77716464d1f0864fbad93cdacd39630, type: 3} + - {fileID: -8642681091945623821, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - {fileID: 444922917, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - {fileID: -652921874, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - {fileID: -1903993783, guid: f77716464d1f0864fbad93cdacd39630, type: 3} @@ -451,7 +451,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1.0680001 + value: 0.018 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -460,7 +460,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.033333335 - value: 0.876 + value: -0.174 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -469,7 +469,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 - value: 0.759 + value: -0.291 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -478,7 +478,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.1 - value: 0.588 + value: -0.462 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -487,7 +487,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.13333334 - value: 0.532 + value: -0.518 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -496,7 +496,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 - value: 0.404 + value: -0.646 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -505,7 +505,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.26666668 - value: 0.24 + value: -0.81 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -514,7 +514,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.36666667 - value: 0.079 + value: -0.971 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -523,7 +523,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.46666667 - value: 0.079 + value: -0.971 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -532,7 +532,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6 - value: 0.079 + value: -0.971 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -551,7 +551,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.20499992 + value: -0.555 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -560,7 +560,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.033333335 - value: -0.363 + value: -0.713 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -569,7 +569,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 - value: -0.409 + value: -0.759 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -578,7 +578,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.1 - value: -0.468 + value: -0.818 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -587,7 +587,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.13333334 - value: -0.491 + value: -0.841 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -596,7 +596,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 - value: -0.525 + value: -0.875 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -605,7 +605,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.26666668 - value: -0.58 + value: -0.93 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -614,7 +614,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.36666667 - value: -0.625 + value: -0.975 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -623,7 +623,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.46666667 - value: -0.625 + value: -0.975 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -632,7 +632,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6 - value: -0.625 + value: -0.975 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -851,7 +851,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1.029 + value: -0.021 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -860,7 +860,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.033333335 - value: 0.827 + value: -0.223 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -869,7 +869,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 - value: 0.749 + value: -0.301 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -878,7 +878,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.1 - value: 0.622 + value: -0.428 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -887,7 +887,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.13333334 - value: 0.511 + value: -0.539 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -896,7 +896,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 - value: 0.356 + value: -0.694 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -905,7 +905,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.26666668 - value: 0.241 + value: -0.809 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -914,7 +914,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.36666667 - value: 0.184 + value: -0.866 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -923,7 +923,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.46666667 - value: 0.114 + value: -0.936 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -932,7 +932,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6 - value: 0.114 + value: -0.936 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -951,7 +951,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.341 + value: -0.009 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -960,7 +960,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.033333335 - value: 0.396 + value: 0.046 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -969,7 +969,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 - value: 0.403 + value: 0.053 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -978,7 +978,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.1 - value: 0.392 + value: 0.042 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -987,7 +987,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.13333334 - value: 0.358 + value: 0.008 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -996,7 +996,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 - value: 0.314 + value: -0.036 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1005,7 +1005,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.26666668 - value: 0.2345 + value: -0.1155 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1014,7 +1014,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.36666667 - value: 0.189 + value: -0.161 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1023,7 +1023,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.46666667 - value: 0.119 + value: -0.231 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1032,7 +1032,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6 - value: 0.119 + value: -0.231 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/square_right.anim b/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/square_right.anim index 899c527fe..ccf050446 100644 --- a/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/square_right.anim +++ b/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/square_right.anim @@ -273,9 +273,9 @@ AnimationClip: - time: 0.16666667 value: {fileID: 444922917, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - time: 0.23333333 - value: {fileID: 4881183030622861663, guid: f77716464d1f0864fbad93cdacd39630, type: 3} + value: {fileID: -8642681091945623821, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - time: 0.33333334 - value: {fileID: -4190599202341174402, guid: f77716464d1f0864fbad93cdacd39630, type: 3} + value: {fileID: 3636556212256844352, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - time: 0.43333334 value: {fileID: -2012133994, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - time: 0.56666666 @@ -342,8 +342,8 @@ AnimationClip: - {fileID: -1903993783, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - {fileID: -652921874, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - {fileID: 444922917, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - - {fileID: 4881183030622861663, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - - {fileID: -4190599202341174402, guid: f77716464d1f0864fbad93cdacd39630, type: 3} + - {fileID: -8642681091945623821, guid: f77716464d1f0864fbad93cdacd39630, type: 3} + - {fileID: 3636556212256844352, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - {fileID: -2012133994, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - {fileID: 356430700, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - {fileID: 356430700, guid: f77716464d1f0864fbad93cdacd39630, type: 3} diff --git a/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/square_rotate.anim b/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/square_rotate.anim index 89efaa6e8..6901b76da 100644 --- a/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/square_rotate.anim +++ b/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/square_rotate.anim @@ -234,9 +234,9 @@ AnimationClip: - time: 0.13333334 value: {fileID: 444922917, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - time: 0.16666667 - value: {fileID: 4881183030622861663, guid: f77716464d1f0864fbad93cdacd39630, type: 3} + value: {fileID: -8642681091945623821, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - time: 0.2 - value: {fileID: -4190599202341174402, guid: f77716464d1f0864fbad93cdacd39630, type: 3} + value: {fileID: 3636556212256844352, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - time: 0.23333333 value: {fileID: -2012133994, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - time: 0.26666668 @@ -312,8 +312,8 @@ AnimationClip: - {fileID: -1903993783, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - {fileID: -652921874, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - {fileID: 444922917, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - - {fileID: 4881183030622861663, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - - {fileID: -4190599202341174402, guid: f77716464d1f0864fbad93cdacd39630, type: 3} + - {fileID: -8642681091945623821, guid: f77716464d1f0864fbad93cdacd39630, type: 3} + - {fileID: 3636556212256844352, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - {fileID: -2012133994, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - {fileID: 356430700, guid: f77716464d1f0864fbad93cdacd39630, type: 3} - {fileID: 956981337, guid: f77716464d1f0864fbad93cdacd39630, type: 3} diff --git a/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/whiteblock.controller b/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/whiteblock.controller index 15f2c5c6d..d1ff28b10 100644 --- a/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/whiteblock.controller +++ b/Assets/Resources/Sprites/Games/BuiltToScaleRvl/Animations/whiteblock.controller @@ -11,22 +11,22 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -1268668811067968051} - m_Position: {x: 140, y: 240, z: 0} + m_Position: {x: 10, y: 270, z: 0} - serializedVersion: 1 m_State: {fileID: 7692729504836814816} - m_Position: {x: 240, y: 20, z: 0} + m_Position: {x: 240, y: 110, z: 0} - serializedVersion: 1 m_State: {fileID: 3544364154507246790} m_Position: {x: 740, y: 40, z: 0} - serializedVersion: 1 m_State: {fileID: -2359814062293944954} - m_Position: {x: 240, y: 110, z: 0} + m_Position: {x: 240, y: 40, z: 0} - serializedVersion: 1 m_State: {fileID: 6682943630204313939} - m_Position: {x: 10, y: 200, z: 0} + m_Position: {x: 240, y: 180, z: 0} - serializedVersion: 1 m_State: {fileID: -1342274123219206497} - m_Position: {x: 260, y: 190, z: 0} + m_Position: {x: 480, y: 180, z: 0} - serializedVersion: 1 m_State: {fileID: -6981893163402565823} m_Position: {x: 510, y: 40, z: 0} @@ -42,12 +42,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -7793962200354681523} m_Position: {x: 990, y: 100, z: 0} - - serializedVersion: 1 - m_State: {fileID: -153942929449566320} - m_Position: {x: 1025, y: 165, z: 0} - serializedVersion: 1 m_State: {fileID: -6453893379027821163} - m_Position: {x: 1060, y: 230, z: 0} + m_Position: {x: 480, y: 240, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -141,7 +138,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: shoot miss AB - m_Speed: 1 + m_Speed: 2 m_CycleOffset: 0 m_Transitions: - {fileID: -4213130632123462687} @@ -189,8 +186,8 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: block_miss_open - m_Speed: 1 + m_Name: miss_open + m_Speed: 2 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -264,7 +261,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: shoot - m_Speed: 1 + m_Speed: 2 m_CycleOffset: 0 m_Transitions: - {fileID: 6436630912677704075} @@ -291,7 +288,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: open - m_Speed: 1 + m_Speed: 2 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -317,7 +314,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: bounce - m_Speed: 1 + m_Speed: 2 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -357,32 +354,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1102 &-153942929449566320 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: blockidle - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 15da8fc77602eaa489460a7ab0ef3b3a, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -484,7 +455,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: miss - m_Speed: 1 + m_Speed: 2 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -510,7 +481,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: shoot miss B - m_Speed: 1 + m_Speed: 2 m_CycleOffset: 0 m_Transitions: - {fileID: -257945245966876999} @@ -549,7 +520,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 0} + m_Motion: {fileID: 7400000, guid: 15da8fc77602eaa489460a7ab0ef3b3a, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Scripts/Games/BuiltToScaleRvl/Block.cs b/Assets/Scripts/Games/BuiltToScaleRvl/Block.cs index 051b71a86..17ae5d1ee 100644 --- a/Assets/Scripts/Games/BuiltToScaleRvl/Block.cs +++ b/Assets/Scripts/Games/BuiltToScaleRvl/Block.cs @@ -13,19 +13,54 @@ namespace HeavenStudio.Games.Scripts_BuiltToScaleRvl public int position; private Animator blockAnim; - public bool isOpen = false; - public bool isPrepare = false; + [System.NonSerialized] public bool isOpen = false; + [System.NonSerialized] public bool isPrepare = false; private double closeBeat = double.MinValue, shootBeat = double.MinValue; + private Vector3 _thisPosition; + private Vector3 _otherPosition; + [SerializeField] private float _slideOffset; + + private Coroutine _currentMove; + private BuiltToScaleRvl game; private void Awake() { + _thisPosition = transform.localPosition; + _otherPosition = _thisPosition + new Vector3(_slideOffset, 0); game = BuiltToScaleRvl.instance; blockAnim = GetComponent(); if (!BuiltToScaleRvl.IsPositionInRange(position)) position = 0; } + private void Update() + { + } + + public void Move(double beat, double length, bool inToScene) + { + if (_currentMove != null) StopCoroutine(_currentMove); + _currentMove = StartCoroutine(MoveCo(beat, length, inToScene)); + } + + private IEnumerator MoveCo(double beat, double length, bool inToScene) + { + if (length <= 0) + { + transform.localPosition = inToScene ? _thisPosition : _otherPosition; + yield break; + } + float normalized = Conductor.instance.GetPositionFromBeat(beat, length, false); + while (normalized <= 1f) + { + normalized = Conductor.instance.GetPositionFromBeat(beat, length); + Vector3 newPos = Vector3.Lerp(inToScene ? _otherPosition : _thisPosition, inToScene ? _thisPosition : _otherPosition, normalized); + transform.localPosition = newPos; + yield return null; + } + } + public void Bounce(double beat) { SoundByte.PlayOneShotGame(position switch { @@ -44,7 +79,11 @@ namespace HeavenStudio.Games.Scripts_BuiltToScaleRvl } public void BounceMiss() { - blockAnim.Play("miss", 0, 0); + if (isOpen) { + blockAnim.Play("miss_open", 0, 0); + } else { + blockAnim.Play("miss", 0, 0); + } } public void Prepare(double beat) diff --git a/Assets/Scripts/Games/BuiltToScaleRvl/BuiltToScaleRvl.cs b/Assets/Scripts/Games/BuiltToScaleRvl/BuiltToScaleRvl.cs index 9d6a12845..d522993fb 100644 --- a/Assets/Scripts/Games/BuiltToScaleRvl/BuiltToScaleRvl.cs +++ b/Assets/Scripts/Games/BuiltToScaleRvl/BuiltToScaleRvl.cs @@ -315,6 +315,7 @@ namespace HeavenStudio.Games { newRod.Init(); newRod.gameObject.SetActive(true); + if (isPlayerOpen) PlayBlockIdle(2, beat); }) });