diff --git a/Assets/Resources/Games/builtToScaleDS.prefab b/Assets/Resources/Games/builtToScaleDS.prefab index 748a383f..8fd76ce6 100644 --- a/Assets/Resources/Games/builtToScaleDS.prefab +++ b/Assets/Resources/Games/builtToScaleDS.prefab @@ -33,6 +33,36 @@ Transform: m_Father: {fileID: 3337760827311893485} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1803360111849034667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 835389391171181030} + m_Layer: 10 + m_Name: BlocksHolder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &835389391171181030 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1803360111849034667} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8319323761679134309} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2034480636994138272 GameObject: m_ObjectHideFlags: 0 @@ -160,6 +190,8 @@ Transform: - {fileID: 1557051792312115487} - {fileID: 1494594296080928600} - {fileID: 7292152612502213159} + - {fileID: 842141362349511046} + - {fileID: 835389391171181030} m_Father: {fileID: 4631944531018638297} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -189,13 +221,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4052947733920485538} - m_LocalRotation: {x: 0.047040753, y: -0.9419751, z: 0.29700354, w: 0.14919424} - m_LocalPosition: {x: 2, y: 5, z: 6.96} + m_LocalRotation: {x: 0.077828385, y: -0.9212198, z: 0.29045945, w: 0.24684015} + m_LocalPosition: {x: 3.35, y: 5.35, z: 6.75} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4631944531018638297} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 35, y: -162, z: 0} + m_LocalEulerAnglesHint: {x: 35, y: -150, z: 0} --- !u!20 &6268063764140376526 Camera: m_ObjectHideFlags: 0 @@ -223,7 +255,7 @@ Camera: far clip plane: 1000 field of view: 49 orthographic: 1 - orthographic size: 1.25 + orthographic size: 1 m_Depth: 0 m_CullingMask: serializedVersion: 2 @@ -316,8 +348,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 5903939180778773926} - {fileID: 5257063787336281836} - - {fileID: 5505299608544811493} - {fileID: 2186723135650062029} - {fileID: 8251119247562495620} m_Father: {fileID: 8319323761679134309} @@ -373,7 +405,15 @@ MonoBehaviour: renderQuadTrans: {fileID: 743597382397742394} cameraPos: {fileID: 6509993024069972873} environmentRenderer: {fileID: 3593377758750892331} - beltSpeed: 5 + flyingRodBase: {fileID: 4881628242623067222} + movingBlocksBase: {fileID: 6531576029795059484} + hitPartsBase: {fileID: 1518590174126965879} + missPartsBase: {fileID: 8775841744012545086} + partsHolder: {fileID: 842141362349511046} + blocksHolder: {fileID: 835389391171181030} + shooterAnim: {fileID: 327112291406064303} + elevatorAnim: {fileID: 1613410199122163856} + beltSpeed: 4.33 --- !u!1 &8373923870426321472 GameObject: m_ObjectHideFlags: 0 @@ -467,6 +507,36 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 +--- !u!1 &8451088964468361308 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 842141362349511046} + m_Layer: 10 + m_Name: PartsHolder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &842141362349511046 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8451088964468361308} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8319323761679134309} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1301957172558251764 PrefabInstance: m_ObjectHideFlags: 0 @@ -875,14 +945,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -2110856612853230395, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} - target: {fileID: -947387224812249842, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0.0000026062855 objectReference: {fileID: 0} + - target: {fileID: -944302891571569470, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} - target: {fileID: -802825371530418220, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -89.98021 objectReference: {fileID: 0} + - target: {fileID: -249144929563529216, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} - target: {fileID: 364309268697413728, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0.0000026062858 @@ -891,6 +973,10 @@ PrefabInstance: propertyPath: m_Name value: HitParts objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} propertyPath: m_IsActive value: 0 @@ -919,10 +1005,26 @@ PrefabInstance: propertyPath: m_Materials.Array.data[5] value: objectReference: {fileID: 2100000, guid: 4f8bd26d58641e94aa444d2ade8f0271, type: 2} + - target: {fileID: 5175829030728775370, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 5428856251986128748, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 6011958246403775304, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} - target: {fileID: 6011958246403775304, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6670651163399061064, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} - target: {fileID: 6670651163399061064, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} propertyPath: m_IsActive value: 1 @@ -941,16 +1043,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} ---- !u!1 &1518590174126965879 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} - m_PrefabInstance: {fileID: 1860677578905467174} - m_PrefabAsset: {fileID: 0} --- !u!4 &2186723135650062029 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} m_PrefabInstance: {fileID: 1860677578905467174} m_PrefabAsset: {fileID: 0} +--- !u!1 &1518590174126965879 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} + m_PrefabInstance: {fileID: 1860677578905467174} + m_PrefabAsset: {fileID: 0} --- !u!95 &4258085773905465771 Animator: serializedVersion: 3 @@ -970,140 +1072,19 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1001 &5470881436180708878 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 7292152612502213159} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_LocalPosition.y - value: -49.499996 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -1869871334352211690, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 89.98021 - objectReference: {fileID: 0} - - target: {fileID: -1869871334352211690, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -0.0000008680054 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_Name - value: MovingBlocks - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2728175015023002165, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -89.98021 - objectReference: {fileID: 0} - - target: {fileID: 4518858451777631492, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 8ed30616db50b7e4a8e9022ca6085652, type: 2} - - target: {fileID: 4518858451777631492, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_Materials.Array.data[3] - value: - objectReference: {fileID: 2100000, guid: 8ed30616db50b7e4a8e9022ca6085652, type: 2} - - target: {fileID: 5219957376676899290, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -0.0000111559 - objectReference: {fileID: 0} - - target: {fileID: 5219957376676899290, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0.00000080673357 - objectReference: {fileID: 0} - - target: {fileID: 5219957376676899290, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -90.00001 - objectReference: {fileID: 0} - - target: {fileID: 8667595228939439361, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0.0000061081146 - objectReference: {fileID: 0} - - target: {fileID: 8667595228939439361, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0.0000008139378 - objectReference: {fileID: 0} - - target: {fileID: 8667595228939439361, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 8.677123e-14 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} ---- !u!1 &5128773691644658527 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - m_PrefabInstance: {fileID: 5470881436180708878} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5505299608544811493 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} - m_PrefabInstance: {fileID: 5470881436180708878} - m_PrefabAsset: {fileID: 0} ---- !u!95 &2349172183013771238 -Animator: - serializedVersion: 3 +--- !u!114 &6523654874484980532 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5128773691644658527} + m_GameObject: {fileID: 1518590174126965879} m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 724cf7891d0bf464ebb86b02d28fb104, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d214166804e7b744da86eebcde1e637f, type: 3} + m_Name: + m_EditorClassIdentifier: + anim: {fileID: 4258085773905465771} --- !u!1001 &5728137633595574535 PrefabInstance: m_ObjectHideFlags: 0 @@ -1113,7 +1094,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} propertyPath: m_LocalPosition.x @@ -1155,6 +1136,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -7650109545886468680, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -7425131087532847277, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -3203485738917446855, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} - target: {fileID: -1003055794911221338, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} propertyPath: m_Materials.Array.data[0] value: @@ -1167,22 +1160,34 @@ PrefabInstance: propertyPath: m_Name value: FlyingRod objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 7226848437003788013, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7863961106138353903, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} ---- !u!1 &4881628242623067222 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} - m_PrefabInstance: {fileID: 5728137633595574535} - m_PrefabAsset: {fileID: 0} --- !u!4 &5257063787336281836 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} m_PrefabInstance: {fileID: 5728137633595574535} m_PrefabAsset: {fileID: 0} +--- !u!1 &4881628242623067222 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} + m_PrefabInstance: {fileID: 5728137633595574535} + m_PrefabAsset: {fileID: 0} --- !u!95 &8117935502587229019 Animator: serializedVersion: 3 @@ -1202,6 +1207,196 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &5969285455209930027 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4881628242623067222} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d214166804e7b744da86eebcde1e637f, type: 3} + m_Name: + m_EditorClassIdentifier: + anim: {fileID: 8117935502587229019} +--- !u!1001 &6225584485801998925 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7292152612502213159} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7204237955642933900, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -6551508385185329638, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -2492640878337709849, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -685714951338797429, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_Name + value: MovingBlocks + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3394299690235127225, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 4518858451777631492, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 8ed30616db50b7e4a8e9022ca6085652, type: 2} + - target: {fileID: 4518858451777631492, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 8ed30616db50b7e4a8e9022ca6085652, type: 2} + - target: {fileID: 4518858451777631492, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: 8ed30616db50b7e4a8e9022ca6085652, type: 2} + - target: {fileID: 4518858451777631492, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_Materials.Array.data[3] + value: + objectReference: {fileID: 2100000, guid: 8ed30616db50b7e4a8e9022ca6085652, type: 2} + - target: {fileID: 5833730649146179553, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8175652456220214933, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} +--- !u!4 &5903939180778773926 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + m_PrefabInstance: {fileID: 6225584485801998925} + m_PrefabAsset: {fileID: 0} +--- !u!1 &6531576029795059484 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + m_PrefabInstance: {fileID: 6225584485801998925} + m_PrefabAsset: {fileID: 0} +--- !u!95 &7940570394249237327 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6531576029795059484} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 724cf7891d0bf464ebb86b02d28fb104, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &2660296812311263321 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6531576029795059484} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d214166804e7b744da86eebcde1e637f, type: 3} + m_Name: + m_EditorClassIdentifier: + anim: {fileID: 7940570394249237327} +--- !u!114 &7221264979161996831 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6531576029795059484} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 14f44ccc2c565b14781c7f959aeef848, type: 3} + m_Name: + m_EditorClassIdentifier: + inList: 0 + lastState: 0 + state: + gameObject: {fileID: 0} + early: 0 + perfect: 0 + late: 0 + createBeat: 0 + isEligible: 0 + eligibleHitsList: [] + aceTimes: 0 + createBeat: 0 + createLength: 0 + anim: {fileID: 7940570394249237327} --- !u!1001 &8104129143664069132 PrefabInstance: m_ObjectHideFlags: 0 @@ -1253,10 +1448,34 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -7792632887967911809, guid: 266571bf0a87816428e18a51e3c57d0f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -6033428231981823279, guid: 266571bf0a87816428e18a51e3c57d0f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -4866640478502395794, guid: 266571bf0a87816428e18a51e3c57d0f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -3032145645166290956, guid: 266571bf0a87816428e18a51e3c57d0f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -2530315915179985130, guid: 266571bf0a87816428e18a51e3c57d0f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 266571bf0a87816428e18a51e3c57d0f, type: 3} propertyPath: m_Name value: ElevatorWithRod objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 266571bf0a87816428e18a51e3c57d0f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} - target: {fileID: 3783149753680359203, guid: 266571bf0a87816428e18a51e3c57d0f, type: 3} propertyPath: m_Materials.Array.data[0] value: @@ -1269,6 +1488,14 @@ PrefabInstance: propertyPath: m_Materials.Array.data[3] value: objectReference: {fileID: 2100000, guid: f8523e095c9f2194d8ae47687a42305a, type: 2} + - target: {fileID: 7581012197924079463, guid: 266571bf0a87816428e18a51e3c57d0f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8650247803943481205, guid: 266571bf0a87816428e18a51e3c57d0f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 266571bf0a87816428e18a51e3c57d0f, type: 3} --- !u!4 &8646102017070181863 stripped @@ -1351,14 +1578,50 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8088575834435831972, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -7761850657100584320, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -7700258416935688289, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -3487895895819380211, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -244648530497092133, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 308257133709792796, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 316072583261635057, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} propertyPath: m_Name value: MissParts objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 2825692475421427110, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} - target: {fileID: 3065674648482680293, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} propertyPath: m_Materials.Array.data[0] value: @@ -1371,18 +1634,22 @@ PrefabInstance: propertyPath: m_Materials.Array.data[3] value: objectReference: {fileID: 2100000, guid: 8ed30616db50b7e4a8e9022ca6085652, type: 2} + - target: {fileID: 8813323920513627783, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} ---- !u!1 &8775841744012545086 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} - m_PrefabInstance: {fileID: 8433944954176581999} - m_PrefabAsset: {fileID: 0} --- !u!4 &8251119247562495620 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} m_PrefabInstance: {fileID: 8433944954176581999} m_PrefabAsset: {fileID: 0} +--- !u!1 &8775841744012545086 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + m_PrefabInstance: {fileID: 8433944954176581999} + m_PrefabAsset: {fileID: 0} --- !u!95 &9102712221565380134 Animator: serializedVersion: 3 @@ -1402,3 +1669,16 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &4478829549985366287 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8775841744012545086} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d214166804e7b744da86eebcde1e637f, type: 3} + m_Name: + m_EditorClassIdentifier: + anim: {fileID: 9102712221565380134} diff --git a/Assets/Resources/Sfx/games/builtToScaleDS.meta b/Assets/Resources/Sfx/games/builtToScaleDS.meta new file mode 100644 index 00000000..bcac7b90 --- /dev/null +++ b/Assets/Resources/Sfx/games/builtToScaleDS.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0f16fd91e0acada45a82667c7bd396d3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/builtToScaleDS/Hit.ogg b/Assets/Resources/Sfx/games/builtToScaleDS/Hit.ogg new file mode 100644 index 00000000..fb2f1f18 Binary files /dev/null and b/Assets/Resources/Sfx/games/builtToScaleDS/Hit.ogg differ diff --git a/Assets/Resources/Sfx/games/builtToScaleDS/Hit.ogg.meta b/Assets/Resources/Sfx/games/builtToScaleDS/Hit.ogg.meta new file mode 100644 index 00000000..16442491 --- /dev/null +++ b/Assets/Resources/Sfx/games/builtToScaleDS/Hit.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 3f09d9adc28384b439a9d0556a8dc69b +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers.png b/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers.png new file mode 100644 index 00000000..388075b8 Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers.png.meta new file mode 100644 index 00000000..9aa23714 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 3789861ed791d6f47993d6a3ff1b3411 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 64 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS.png b/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS.png new file mode 100644 index 00000000..6b6a6bc1 Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS.png.meta new file mode 100644 index 00000000..37fcfad2 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: 42749c77098fb4d41aa40f851ac72e3d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/BuiltToScaleDS/Animations/MovingBlocks.controller b/Assets/Resources/Sprites/Games/BuiltToScaleDS/Animations/MovingBlocks.controller index f2badc0e..2876ab7b 100644 --- a/Assets/Resources/Sprites/Games/BuiltToScaleDS/Animations/MovingBlocks.controller +++ b/Assets/Resources/Sprites/Games/BuiltToScaleDS/Animations/MovingBlocks.controller @@ -10,8 +10,8 @@ AnimatorStateMachine: m_Name: Base Layer m_ChildStates: - serializedVersion: 1 - m_State: {fileID: 3323039142518375142} - m_Position: {x: 280, y: 110, z: 0} + m_State: {fileID: 4546687776082381398} + m_Position: {x: 290, y: 110, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -21,7 +21,7 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 3323039142518375142} + m_DefaultState: {fileID: 4546687776082381398} --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -44,7 +44,7 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1102 &3323039142518375142 +--- !u!1102 &4546687776082381398 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -64,9 +64,9 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: -7095431843126280680, guid: 5bad1689d622aa24e96835f18f9a49cd, type: 3} + m_Motion: {fileID: -7095431843126280680, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: - m_TimeParameter: + m_TimeParameter: NormTime diff --git a/Assets/Resources/Sprites/Games/BuiltToScaleDS/Animations/Shooter.controller b/Assets/Resources/Sprites/Games/BuiltToScaleDS/Animations/Shooter.controller index ade05672..e85d7c65 100644 --- a/Assets/Resources/Sprites/Games/BuiltToScaleDS/Animations/Shooter.controller +++ b/Assets/Resources/Sprites/Games/BuiltToScaleDS/Animations/Shooter.controller @@ -26,6 +26,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-3888286644032445258 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: WindDown + 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: 241429122767823071, guid: 26c46c4ecd6e69145a6e971ac2cf6dcf, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-2890999575255706306 AnimatorState: serializedVersion: 6 @@ -96,6 +122,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -1361826925033568764} m_Position: {x: 270, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: -3888286644032445258} + m_Position: {x: 500, y: 180, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Resources/Sprites/Games/BuiltToScaleDS/MovingBlocks.fbx b/Assets/Resources/Sprites/Games/BuiltToScaleDS/MovingBlocks.fbx index 933a2605..bc662b24 100644 Binary files a/Assets/Resources/Sprites/Games/BuiltToScaleDS/MovingBlocks.fbx and b/Assets/Resources/Sprites/Games/BuiltToScaleDS/MovingBlocks.fbx differ diff --git a/Assets/Resources/Sprites/Games/BuiltToScaleDS/MovingBlocks.fbx.meta b/Assets/Resources/Sprites/Games/BuiltToScaleDS/MovingBlocks.fbx.meta index 22028d30..9ea12279 100644 --- a/Assets/Resources/Sprites/Games/BuiltToScaleDS/MovingBlocks.fbx.meta +++ b/Assets/Resources/Sprites/Games/BuiltToScaleDS/MovingBlocks.fbx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5bad1689d622aa24e96835f18f9a49cd +guid: e6239db4d6763504fa0e5ad6ce9761b7 ModelImporter: serializedVersion: 20200 internalIDToNameTable: @@ -26,7 +26,7 @@ ModelImporter: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 importConstraints: 0 - animationCompression: 1 + animationCompression: 0 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 diff --git a/Assets/Scripts/Games/BuiltToScaleDS/BTSPiece.cs b/Assets/Scripts/Games/BuiltToScaleDS/BTSPiece.cs new file mode 100644 index 00000000..a85b11ab --- /dev/null +++ b/Assets/Scripts/Games/BuiltToScaleDS/BTSPiece.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +using RhythmHeavenMania.Util; +namespace RhythmHeavenMania.Games.BuiltToScaleDS +{ + public class BTSPiece : MonoBehaviour + { + public Animator anim; + + void LateUpdate() + { + if (anim.IsAnimationNotPlaying()) + Destroy(gameObject); + } + } +} diff --git a/Assets/Scripts/Games/BuiltToScaleDS/BTSPiece.cs.meta b/Assets/Scripts/Games/BuiltToScaleDS/BTSPiece.cs.meta new file mode 100644 index 00000000..ad2db4db --- /dev/null +++ b/Assets/Scripts/Games/BuiltToScaleDS/BTSPiece.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d214166804e7b744da86eebcde1e637f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/BuiltToScaleDS/Blocks.cs b/Assets/Scripts/Games/BuiltToScaleDS/Blocks.cs new file mode 100644 index 00000000..04ecb15b --- /dev/null +++ b/Assets/Scripts/Games/BuiltToScaleDS/Blocks.cs @@ -0,0 +1,87 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using System; + +namespace RhythmHeavenMania.Games.BuiltToScaleDS +{ + using RhythmHeavenMania.Util; + public class Blocks : PlayerActionObject + { + public float createBeat; + public float createLength; + public Animator anim; + + private bool moving = true; + private BuiltToScaleDS game; + + private void Awake() + { + game = BuiltToScaleDS.instance; + } + + private void Update() + { + if (!moving) return; + + var windupBeat = createBeat + (createLength * 3.5f); + var hitBeat = windupBeat + createLength; + var currentBeat = Conductor.instance.songPositionInBeats; + + var shooterState = game.shooterAnim.GetCurrentAnimatorStateInfo(0); + if (currentBeat > windupBeat && currentBeat < hitBeat + && !shooterState.IsName("Windup") + && game.shooterAnim.IsAnimationNotPlaying()) + { + game.shooterAnim.Play("Windup", 0, 0); + } + + float stateBeat = Conductor.instance.GetPositionFromMargin(createBeat + (createLength * 4.5f), 1f); + StateCheck(stateBeat); + + if (PlayerInput.Pressed()) + { + if (state.perfect) + { + Ace(); + } + else if (state.notPerfect()) + { + Miss(); + } + } + + if (moving && anim.GetCurrentAnimatorStateInfo(0).normalizedTime < 0.9f) + { + game.SetBlockTime(this, createBeat, createLength); + } + } + + void Ace() + { + moving = false; + game.shootingThisFrame = true; + + game.Shoot(); + game.SpawnObject(BuiltToScaleDS.BTSObject.HitPieces); + Destroy(gameObject); + + Jukebox.PlayOneShotGame("builtToScaleDS/Hit"); + } + + void Miss() + { + moving = false; + game.shootingThisFrame = true; + + game.Shoot(); + game.SpawnObject(BuiltToScaleDS.BTSObject.MissPieces); + Destroy(gameObject); + } + + public override void OnAce() + { + Ace(); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Games/BuiltToScaleDS/Blocks.cs.meta b/Assets/Scripts/Games/BuiltToScaleDS/Blocks.cs.meta new file mode 100644 index 00000000..3cfa9c61 --- /dev/null +++ b/Assets/Scripts/Games/BuiltToScaleDS/Blocks.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 14f44ccc2c565b14781c7f959aeef848 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs b/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs index d7ea4205..2b895b8a 100644 --- a/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs +++ b/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs @@ -3,18 +3,29 @@ using System.Collections.Generic; using UnityEngine; using NaughtyBezierCurves; using DG.Tweening; +using System; using RhythmHeavenMania.Util; namespace RhythmHeavenMania.Games.BuiltToScaleDS { public class BuiltToScaleDS : Minigame { + public enum BTSObject { HitPieces, MissPieces, FlyingRod } + [Header("Camera")] public Transform renderQuadTrans; public Transform cameraPos; [Header("References")] public SkinnedMeshRenderer environmentRenderer; + public GameObject flyingRodBase; + public GameObject movingBlocksBase; + public GameObject hitPartsBase; + public GameObject missPartsBase; + public Transform partsHolder; + public Transform blocksHolder; + public Animator shooterAnim; + public Animator elevatorAnim; [Header("Properties")] public float beltSpeed = 1f; @@ -22,6 +33,8 @@ namespace RhythmHeavenMania.Games.BuiltToScaleDS private Material beltMaterial; private Material[] environmentMaterials; private float currentBeltOffset; + + [NonSerialized] public bool shootingThisFrame; public static BuiltToScaleDS instance; @@ -43,13 +56,129 @@ namespace RhythmHeavenMania.Games.BuiltToScaleDS var camHeight = 2f * cam.orthographicSize; var camWidth = camHeight * cam.aspect; renderQuadTrans.localScale = new Vector3(camWidth, camHeight, 1f); + + elevatorAnim.Play("MakeRod", 0, 1f); } + List spawnedBlockEvents = new List(); void Update() { + if (!Conductor.instance.isPlaying && !Conductor.instance.isPaused) + return; + + var currentBeat = Conductor.instance.songPositionInBeats; + + var blockEvents = GameManager.instance.Beatmap.entities.FindAll(c => c.datamodel == "builtToScaleDS/spawn blocks"); + for (int i = 0; i < blockEvents.Count; i++) + { + var ev = blockEvents[i]; + if (spawnedBlockEvents.Contains(ev)) continue; // Don't spawn the same blocks multiple times. + + var spawnBeat = ev.beat - (ev.length * 0.5f); + if (currentBeat > spawnBeat && currentBeat < ev.beat + ev.length) + { + SpawnBlocks(spawnBeat, ev.length); + spawnedBlockEvents.Add(ev); + break; + } + } + currentBeltOffset = (currentBeltOffset + Time.deltaTime * -beltSpeed) % 1f; beltMaterial.mainTextureOffset = new Vector2(0f, currentBeltOffset); environmentRenderer.materials = environmentMaterials; } + + void LateUpdate() + { + var shooterState = shooterAnim.GetCurrentAnimatorStateInfo(0); + bool canShoot = !shooterState.IsName("Shoot") || shooterAnim.IsAnimationNotPlaying(); + + if (canShoot && PlayerInput.Pressed() && !shootingThisFrame) + { + shootingThisFrame = true; + Shoot(); + SpawnObject(BTSObject.FlyingRod); + } + + if (!shootingThisFrame) + { + if (blocksHolder.childCount == 0 && shooterState.IsName("Windup") && shooterAnim.IsAnimationNotPlaying()) + { + shooterAnim.Play("WindDown", 0, 0); + } + } + + shootingThisFrame = false; + } + + public void SpawnBlocks(float beat, float length) + { + var newBlocks = GameObject.Instantiate(movingBlocksBase, blocksHolder).GetComponent(); + newBlocks.createBeat = beat; + newBlocks.createLength = length; + newBlocks.gameObject.SetActive(true); + + SetBlockTime(newBlocks, beat, length); + } + + const int blockFramesPerSecond = 24; + const int blockHitFrame = 39; + const int blockTotalFrames = 80; + List criticalFrames = new List { 7, 15, 23, 31, 39, 47 }; + public void SetBlockTime(Blocks blocks, float spawnBeat, float length) + { + float secondsPerFrame = 1f / blockFramesPerSecond; + float secondsToHitFrame = secondsPerFrame * blockHitFrame; + + float secondsPerBeat = Conductor.instance.secPerBeat; + float secondsToHitBeat = secondsPerBeat * 4.5f * length; + + float speedMult = secondsToHitFrame / secondsToHitBeat; + + float secondsPastSpawnTime = secondsPerBeat * (Conductor.instance.songPositionInBeats - spawnBeat); + float framesPastSpawnTime = blockFramesPerSecond * speedMult * secondsPastSpawnTime; + + // The only way I could deal with Unity's interpolation shenanigans without having a stroke. + if (criticalFrames.Contains(Mathf.FloorToInt(framesPastSpawnTime))) + framesPastSpawnTime = Mathf.CeilToInt(framesPastSpawnTime); + + blocks.anim.Play("Move", 0, framesPastSpawnTime / blockTotalFrames); + blocks.anim.speed = speedMult; + } + + public void SpawnObject(BTSObject btsObject) + { + GameObject prefabToUse = null; + string animNameToUse = ""; + + switch (btsObject) + { + case BTSObject.HitPieces: + prefabToUse = hitPartsBase; + animNameToUse = "PartsHit"; + break; + case BTSObject.MissPieces: + prefabToUse = missPartsBase; + animNameToUse = "PartsMiss"; + break; + case BTSObject.FlyingRod: + prefabToUse = flyingRodBase; + animNameToUse = "Fly"; + break; + } + + if (prefabToUse != null) + { + var newPiece = GameObject.Instantiate(prefabToUse, partsHolder).GetComponent(); + newPiece.gameObject.SetActive(true); + newPiece.anim.Play(animNameToUse, 0, 0); + } + } + + public void Shoot() + { + shooterAnim.Play("Shoot", 0, 0); + elevatorAnim.Play("MakeRod", 0, 0); + } } } \ No newline at end of file diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index 7a3734a2..6fb61843 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -12,6 +12,7 @@ using RhythmHeavenMania.Games.SpaceSoccer; using RhythmHeavenMania.Games.DJSchool; using RhythmHeavenMania.Games.RhythmTweezers; using RhythmHeavenMania.Games.RhythmRally; +using RhythmHeavenMania.Games.BuiltToScaleDS; namespace RhythmHeavenMania { @@ -196,7 +197,7 @@ namespace RhythmHeavenMania new Param("type", new EntityTypes.Integer(0, 2, 0), "Type"), }), }), - new Minigame("rhythmTweezers", "Rhythm Tweezers \n[WIP don't use]", "98b389", false, false, new List() + new Minigame("rhythmTweezers", "Rhythm Tweezers", "98b389", false, false, new List() { new GameAction("start interval", delegate { RhythmTweezers.instance.SetIntervalStart(eventCaller.currentEntity.beat, eventCaller.currentEntity.length); }, 4f, true), new GameAction("short hair", delegate { RhythmTweezers.instance.SpawnHair(eventCaller.currentEntity.beat); }, 0.5f), @@ -228,7 +229,7 @@ namespace RhythmHeavenMania }), new Minigame("builtToScaleDS", "Built To Scale (DS) \n[WIP don't use]", "B888F8", true, false, new List() { - + new GameAction("spawn blocks", delegate { }, 1f, true) }), /*new Minigame("spaceDance", "Space Dance", "B888F8", new List() {