From 05ec330f082a8381416903afe3cc722cd9213ed9 Mon Sep 17 00:00:00 2001 From: Dominik Date: Sat, 17 Jun 2023 17:27:06 +0200 Subject: [PATCH] Animation Push --- .../FrankAnimator.controller | 188 +++++++++++++++++- .../AnimationsAndAnimators/FrankDimShift.anim | 5 +- .../FrankPushingAnim.anim | 77 +++++++ .../FrankPushingAnim.anim.meta | 8 + .../AssetsFORELLE/Script/IsPushingTester.cs | 49 +++++ .../Script/IsPushingTester.cs.meta | 11 + .../Spritesheet/pinguin_push.png.meta | 108 +++++++++- .../2023-05-04 Pressure Plates.scenetemplate | 4 + .../Scenes/AnimationBeta2-2704.scenetemplate | 4 + .../AnimationBeta2-2704Even.scenetemplate | 4 + Assets/Scenes/BoxMovable.scenetemplate | 4 + Assets/Scenes/ButtonTypes.scenetemplate | 4 + Assets/Scenes/DScene.unity | 90 ++++++++- 13 files changed, 543 insertions(+), 13 deletions(-) create mode 100644 Assets/AssetsFORELLE/AnimationsAndAnimators/FrankPushingAnim.anim create mode 100644 Assets/AssetsFORELLE/AnimationsAndAnimators/FrankPushingAnim.anim.meta create mode 100644 Assets/AssetsFORELLE/Script/IsPushingTester.cs create mode 100644 Assets/AssetsFORELLE/Script/IsPushingTester.cs.meta diff --git a/Assets/AssetsFORELLE/AnimationsAndAnimators/FrankAnimator.controller b/Assets/AssetsFORELLE/AnimationsAndAnimators/FrankAnimator.controller index abdb4ab..9bac899 100644 --- a/Assets/AssetsFORELLE/AnimationsAndAnimators/FrankAnimator.controller +++ b/Assets/AssetsFORELLE/AnimationsAndAnimators/FrankAnimator.controller @@ -1,5 +1,33 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8821652556207839095 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsMoving + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: IsPushing + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -686996836145004079} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.44444448 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-8557840121466579528 AnimatorState: serializedVersion: 6 @@ -14,6 +42,7 @@ AnimatorState: - {fileID: 7122805803384208300} - {fileID: -8445031088898702242} - {fileID: 280588919099055742} + - {fileID: 8375352772450436786} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -79,6 +108,34 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-6658489744942200529 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsMoving + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: IsPushing + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8557840121466579528} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.06250006 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1109 &-6600724781094040810 AnimatorTransition: m_ObjectHideFlags: 1 @@ -93,6 +150,60 @@ AnimatorTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 1 +--- !u!1101 &-1397818447355866968 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsMoving + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4947149536102974998} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.06250006 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-686996836145004079 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FrankPushingAnim + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -1397818447355866968} + - {fileID: -6658489744942200529} + - {fileID: 2282681784311468456} + 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: 6cfd1cb5ddd53c549970686ee971e385, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-61994700436772734 AnimatorState: serializedVersion: 6 @@ -135,13 +246,19 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: ShiftsDim m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} + - m_Name: IsPushing + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -216,13 +333,16 @@ AnimatorStateTransition: - m_ConditionMode: 1 m_ConditionEvent: IsMoving m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: IsPushing + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -8557840121466579528} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.44444448 m_HasExitTime: 0 @@ -230,6 +350,34 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &2282681784311468456 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsMoving + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: IsPushing + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -686996836145004079} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.06250006 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &2588938163775650346 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -315,6 +463,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -61994700436772734} m_Position: {x: 120, y: 400, z: 0} + - serializedVersion: 1 + m_State: {fileID: -686996836145004079} + m_Position: {x: 730, y: 30, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: @@ -341,6 +492,7 @@ AnimatorState: - {fileID: 1534402292608164409} - {fileID: -7481547280174664885} - {fileID: 1484097650644464457} + - {fileID: -8821652556207839095} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -373,7 +525,35 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.2105264 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &8375352772450436786 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsMoving + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: IsPushing + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -686996836145004079} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.2105264 m_HasExitTime: 0 diff --git a/Assets/AssetsFORELLE/AnimationsAndAnimators/FrankDimShift.anim b/Assets/AssetsFORELLE/AnimationsAndAnimators/FrankDimShift.anim index 5c65567..6f689e8 100644 --- a/Assets/AssetsFORELLE/AnimationsAndAnimators/FrankDimShift.anim +++ b/Assets/AssetsFORELLE/AnimationsAndAnimators/FrankDimShift.anim @@ -21,6 +21,8 @@ AnimationClip: - curve: - time: 0 value: {fileID: 1969513919, guid: 1455a3c98fe793a4782adb5e07c09200, type: 3} + - time: 0.05 + value: {fileID: 876503906, guid: 1455a3c98fe793a4782adb5e07c09200, type: 3} attribute: m_Sprite path: classID: 212 @@ -41,12 +43,13 @@ AnimationClip: isPPtrCurve: 1 pptrCurveMapping: - {fileID: 1969513919, guid: 1455a3c98fe793a4782adb5e07c09200, type: 3} + - {fileID: 876503906, guid: 1455a3c98fe793a4782adb5e07c09200, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.016666668 + m_StopTime: 0.06666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/AssetsFORELLE/AnimationsAndAnimators/FrankPushingAnim.anim b/Assets/AssetsFORELLE/AnimationsAndAnimators/FrankPushingAnim.anim new file mode 100644 index 0000000..e21c4d3 --- /dev/null +++ b/Assets/AssetsFORELLE/AnimationsAndAnimators/FrankPushingAnim.anim @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FrankPushingAnim + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 1175471496, guid: a5cd12116c086d34a850f1cb4aed90f1, type: 3} + - time: 0.083333336 + value: {fileID: 350457352, guid: a5cd12116c086d34a850f1cb4aed90f1, type: 3} + - time: 0.16666667 + value: {fileID: -1707304659, guid: a5cd12116c086d34a850f1cb4aed90f1, type: 3} + - time: 0.25 + value: {fileID: 1534545121, guid: a5cd12116c086d34a850f1cb4aed90f1, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 1175471496, guid: a5cd12116c086d34a850f1cb4aed90f1, type: 3} + - {fileID: 350457352, guid: a5cd12116c086d34a850f1cb4aed90f1, type: 3} + - {fileID: -1707304659, guid: a5cd12116c086d34a850f1cb4aed90f1, type: 3} + - {fileID: 1534545121, guid: a5cd12116c086d34a850f1cb4aed90f1, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.26666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/AssetsFORELLE/AnimationsAndAnimators/FrankPushingAnim.anim.meta b/Assets/AssetsFORELLE/AnimationsAndAnimators/FrankPushingAnim.anim.meta new file mode 100644 index 0000000..390f97f --- /dev/null +++ b/Assets/AssetsFORELLE/AnimationsAndAnimators/FrankPushingAnim.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6cfd1cb5ddd53c549970686ee971e385 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AssetsFORELLE/Script/IsPushingTester.cs b/Assets/AssetsFORELLE/Script/IsPushingTester.cs new file mode 100644 index 0000000..87509c6 --- /dev/null +++ b/Assets/AssetsFORELLE/Script/IsPushingTester.cs @@ -0,0 +1,49 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class IsPushingTester: MonoBehaviour +{ + private Animator animator; + private Rigidbody2D rb; + private bool isColliding; + + + void Start() + { + animator = GetComponent(); + rb = GetComponent(); + isColliding = false; + } + + void Update() + { + if (isColliding && rb.velocity.magnitude > 0.1f) + { + animator.SetBool("IsPushing", true); + } + else + { + + animator.SetBool("IsPushing", false); + + } + } + + void OnCollisionEnter2D(Collision2D collision) + { + if (collision.gameObject.CompareTag("PressurePlatable") && collision.collider is EdgeCollider2D) + { + isColliding = true; + } + } + + void OnCollisionExit2D(Collision2D collision) + { + if (collision.gameObject.CompareTag("PressurePlatable") && collision.collider is EdgeCollider2D) + { + + isColliding = false; + } + } +} \ No newline at end of file diff --git a/Assets/AssetsFORELLE/Script/IsPushingTester.cs.meta b/Assets/AssetsFORELLE/Script/IsPushingTester.cs.meta new file mode 100644 index 0000000..4ad622f --- /dev/null +++ b/Assets/AssetsFORELLE/Script/IsPushingTester.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a821d8b41cb035c44a9a7c0b05ede9c4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AssetsFORELLE/Sprites/Character/Frank/Gameplay/Spritesheet/pinguin_push.png.meta b/Assets/AssetsFORELLE/Sprites/Character/Frank/Gameplay/Spritesheet/pinguin_push.png.meta index 5e91670..109d215 100644 --- a/Assets/AssetsFORELLE/Sprites/Character/Frank/Gameplay/Spritesheet/pinguin_push.png.meta +++ b/Assets/AssetsFORELLE/Sprites/Character/Frank/Gameplay/Spritesheet/pinguin_push.png.meta @@ -42,12 +42,12 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 10 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -101,9 +101,105 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: pinguin_push_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5075723bb06942c4eb6282f844038e6f + internalID: 1175471496 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: pinguin_push_1 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b049d17ac935621469151ec156839f01 + internalID: 350457352 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: pinguin_push_2 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b0045e04dbaf2f046934f3b91c86773b + internalID: -1707304659 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: pinguin_push_3 + rect: + serializedVersion: 2 + x: 96 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 54ee00de5d552f04c911fd6199dc47d1 + internalID: 1534545121 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -114,7 +210,11 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - nameFileIdTable: {} + nameFileIdTable: + pinguin_push_0: 1175471496 + pinguin_push_1: 350457352 + pinguin_push_2: -1707304659 + pinguin_push_3: 1534545121 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Scenes/2023-05-04 Pressure Plates.scenetemplate b/Assets/Scenes/2023-05-04 Pressure Plates.scenetemplate index 96773a6..34f89ea 100644 --- a/Assets/Scenes/2023-05-04 Pressure Plates.scenetemplate +++ b/Assets/Scenes/2023-05-04 Pressure Plates.scenetemplate @@ -41,6 +41,8 @@ MonoBehaviour: instantiationMode: 0 - dependency: {fileID: 2800000, guid: 748ae8b33df036b46a86e0387f1602cf, type: 3} instantiationMode: 0 + - dependency: {fileID: 2800000, guid: a5cd12116c086d34a850f1cb4aed90f1, type: 3} + instantiationMode: 0 - dependency: {fileID: 2800000, guid: 194aedcc234be71428a25e32d62ccd9d, type: 3} instantiationMode: 0 - dependency: {fileID: 2800000, guid: 311925a002f4447b3a28927169b83ea6, type: 3} @@ -53,6 +55,8 @@ MonoBehaviour: instantiationMode: 0 - dependency: {fileID: 2800000, guid: ac4f690e99db5bb43bedb920eda2f7c5, type: 3} instantiationMode: 0 + - dependency: {fileID: 7400000, guid: 6cfd1cb5ddd53c549970686ee971e385, type: 2} + instantiationMode: 0 - dependency: {fileID: 2800000, guid: 23e66f7264c74424889342127f229577, type: 3} instantiationMode: 0 templatePipeline: {fileID: 0} diff --git a/Assets/Scenes/AnimationBeta2-2704.scenetemplate b/Assets/Scenes/AnimationBeta2-2704.scenetemplate index a05ce16..f159a25 100644 --- a/Assets/Scenes/AnimationBeta2-2704.scenetemplate +++ b/Assets/Scenes/AnimationBeta2-2704.scenetemplate @@ -41,6 +41,8 @@ MonoBehaviour: instantiationMode: 0 - dependency: {fileID: 2800000, guid: 748ae8b33df036b46a86e0387f1602cf, type: 3} instantiationMode: 0 + - dependency: {fileID: 2800000, guid: a5cd12116c086d34a850f1cb4aed90f1, type: 3} + instantiationMode: 0 - dependency: {fileID: 2800000, guid: 194aedcc234be71428a25e32d62ccd9d, type: 3} instantiationMode: 0 - dependency: {fileID: 2800000, guid: bc1e36585ebd79d4db8ca18c1637587d, type: 3} @@ -49,6 +51,8 @@ MonoBehaviour: instantiationMode: 0 - dependency: {fileID: 2800000, guid: ac4f690e99db5bb43bedb920eda2f7c5, type: 3} instantiationMode: 0 + - dependency: {fileID: 7400000, guid: 6cfd1cb5ddd53c549970686ee971e385, type: 2} + instantiationMode: 0 templatePipeline: {fileID: 0} badge: {fileID: 0} addToDefaults: 0 diff --git a/Assets/Scenes/AnimationBeta2-2704Even.scenetemplate b/Assets/Scenes/AnimationBeta2-2704Even.scenetemplate index 6ed1dd3..8032c6c 100644 --- a/Assets/Scenes/AnimationBeta2-2704Even.scenetemplate +++ b/Assets/Scenes/AnimationBeta2-2704Even.scenetemplate @@ -41,6 +41,8 @@ MonoBehaviour: instantiationMode: 0 - dependency: {fileID: 2800000, guid: 748ae8b33df036b46a86e0387f1602cf, type: 3} instantiationMode: 0 + - dependency: {fileID: 2800000, guid: a5cd12116c086d34a850f1cb4aed90f1, type: 3} + instantiationMode: 0 - dependency: {fileID: 2800000, guid: 194aedcc234be71428a25e32d62ccd9d, type: 3} instantiationMode: 0 - dependency: {fileID: 2800000, guid: bc1e36585ebd79d4db8ca18c1637587d, type: 3} @@ -49,6 +51,8 @@ MonoBehaviour: instantiationMode: 0 - dependency: {fileID: 2800000, guid: ac4f690e99db5bb43bedb920eda2f7c5, type: 3} instantiationMode: 0 + - dependency: {fileID: 7400000, guid: 6cfd1cb5ddd53c549970686ee971e385, type: 2} + instantiationMode: 0 templatePipeline: {fileID: 0} badge: {fileID: 0} addToDefaults: 0 diff --git a/Assets/Scenes/BoxMovable.scenetemplate b/Assets/Scenes/BoxMovable.scenetemplate index 7d3d1f0..7ac6f51 100644 --- a/Assets/Scenes/BoxMovable.scenetemplate +++ b/Assets/Scenes/BoxMovable.scenetemplate @@ -43,6 +43,8 @@ MonoBehaviour: instantiationMode: 0 - dependency: {fileID: 2800000, guid: 748ae8b33df036b46a86e0387f1602cf, type: 3} instantiationMode: 0 + - dependency: {fileID: 2800000, guid: a5cd12116c086d34a850f1cb4aed90f1, type: 3} + instantiationMode: 0 - dependency: {fileID: 2800000, guid: 194aedcc234be71428a25e32d62ccd9d, type: 3} instantiationMode: 0 - dependency: {fileID: 2800000, guid: bc1e36585ebd79d4db8ca18c1637587d, type: 3} @@ -51,6 +53,8 @@ MonoBehaviour: instantiationMode: 0 - dependency: {fileID: 2800000, guid: ac4f690e99db5bb43bedb920eda2f7c5, type: 3} instantiationMode: 0 + - dependency: {fileID: 7400000, guid: 6cfd1cb5ddd53c549970686ee971e385, type: 2} + instantiationMode: 0 - dependency: {fileID: 2800000, guid: 23e66f7264c74424889342127f229577, type: 3} instantiationMode: 0 templatePipeline: {fileID: 0} diff --git a/Assets/Scenes/ButtonTypes.scenetemplate b/Assets/Scenes/ButtonTypes.scenetemplate index 94d2c3a..68f6eb2 100644 --- a/Assets/Scenes/ButtonTypes.scenetemplate +++ b/Assets/Scenes/ButtonTypes.scenetemplate @@ -45,6 +45,8 @@ MonoBehaviour: instantiationMode: 0 - dependency: {fileID: 2800000, guid: 748ae8b33df036b46a86e0387f1602cf, type: 3} instantiationMode: 0 + - dependency: {fileID: 2800000, guid: a5cd12116c086d34a850f1cb4aed90f1, type: 3} + instantiationMode: 0 - dependency: {fileID: 2800000, guid: 194aedcc234be71428a25e32d62ccd9d, type: 3} instantiationMode: 0 - dependency: {fileID: 2800000, guid: 311925a002f4447b3a28927169b83ea6, type: 3} @@ -53,6 +55,8 @@ MonoBehaviour: instantiationMode: 0 - dependency: {fileID: 2800000, guid: f0562aa725f59684cbbf4dac90ab7aae, type: 3} instantiationMode: 0 + - dependency: {fileID: 7400000, guid: 6cfd1cb5ddd53c549970686ee971e385, type: 2} + instantiationMode: 0 - dependency: {fileID: 2800000, guid: 616c5890bd1a44340b72cd4c9f3befc2, type: 3} instantiationMode: 0 - dependency: {fileID: 2800000, guid: ac4f690e99db5bb43bedb920eda2f7c5, type: 3} diff --git a/Assets/Scenes/DScene.unity b/Assets/Scenes/DScene.unity index a2257a4..dfd84ef 100644 --- a/Assets/Scenes/DScene.unity +++ b/Assets/Scenes/DScene.unity @@ -328,11 +328,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e28dfd33df66e4047a79bdf79a599a79, type: 3} m_Name: m_EditorClassIdentifier: - spriteRenderer: {fileID: 0} + spriteRenderer: {fileID: 321396287} originalSprite: {fileID: 0} activatedSprite: {fileID: 0} startActivated: 0 dreiAn: 0 +--- !u!212 &321396287 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 3743697183328372274, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} + m_PrefabInstance: {fileID: 576363002} + m_PrefabAsset: {fileID: 0} --- !u!1001 &576363002 PrefabInstance: m_ObjectHideFlags: 0 @@ -491,11 +496,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2931262115788872107, guid: a72839b3ed4bd20458a1b530b3f3d5bc, type: 3} propertyPath: m_LocalPosition.x - value: -6.15 + value: -7.8 objectReference: {fileID: 0} - target: {fileID: 2931262115788872107, guid: a72839b3ed4bd20458a1b530b3f3d5bc, type: 3} propertyPath: m_LocalPosition.y - value: 2.71 + value: -1.82 objectReference: {fileID: 0} - target: {fileID: 2931262115788872107, guid: a72839b3ed4bd20458a1b530b3f3d5bc, type: 3} propertyPath: m_LocalPosition.z @@ -541,6 +546,14 @@ PrefabInstance: propertyPath: m_LinearDrag value: 1 objectReference: {fileID: 0} + - target: {fileID: 8547966821854904316, guid: a72839b3ed4bd20458a1b530b3f3d5bc, type: 3} + propertyPath: m_Size.x + value: 1.3849039 + objectReference: {fileID: 0} + - target: {fileID: 8547966821854904316, guid: a72839b3ed4bd20458a1b530b3f3d5bc, type: 3} + propertyPath: m_Offset.x + value: 0.0075478554 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a72839b3ed4bd20458a1b530b3f3d5bc, type: 3} --- !u!1 &1025485189 stripped @@ -560,11 +573,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 06a77ec31d8a8c241a9551c90c41d8b4, type: 3} m_Name: m_EditorClassIdentifier: - spriteRenderer: {fileID: 0} + spriteRenderer: {fileID: 1025485198} originalSprite: {fileID: 0} activatedSprite: {fileID: 0} startActivated: 0 zweiAn: 0 +--- !u!212 &1025485198 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 3743697183328372274, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} + m_PrefabInstance: {fileID: 6557371} + m_PrefabAsset: {fileID: 0} --- !u!1 &1336267132 GameObject: m_ObjectHideFlags: 0 @@ -582,6 +600,7 @@ GameObject: - component: {fileID: 1336267135} - component: {fileID: 1336267134} - component: {fileID: 1336267133} + - component: {fileID: 1336267142} m_Layer: 0 m_Name: Frank m_TagString: Player @@ -772,6 +791,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1336267142 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1336267132} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a821d8b41cb035c44a9a7c0b05ede9c4, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1348280036 PrefabInstance: m_ObjectHideFlags: 0 @@ -7136,6 +7167,8 @@ MonoBehaviour: movingPoint: {fileID: 801537424} activatedPointPosition: {x: -0.92, y: 0, z: 0} einsAn: 0 + zweiAn: 0 + dreiAn: 0 --- !u!1001 &2011257467 PrefabInstance: m_ObjectHideFlags: 0 @@ -7262,6 +7295,55 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2055683369 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2931262115788872085, guid: a72839b3ed4bd20458a1b530b3f3d5bc, type: 3} + m_PrefabInstance: {fileID: 1005776863} + m_PrefabAsset: {fileID: 0} +--- !u!68 &2055683375 +EdgeCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2055683369} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_EdgeRadius: 0 + m_Points: + - {x: -0.6829815, y: -0.6868744} + - {x: -0.6832199, y: 0.65668213} + m_AdjacentStartPoint: {x: 0, y: 0} + m_AdjacentEndPoint: {x: 0, y: 0} + m_UseAdjacentStartPoint: 0 + m_UseAdjacentEndPoint: 0 +--- !u!68 &2055683376 +EdgeCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2055683369} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_EdgeRadius: 0 + m_Points: + - {x: 0.70586395, y: 0.6868744} + - {x: 0.69052935, y: -0.6868744} + m_AdjacentStartPoint: {x: 0, y: 0} + m_AdjacentEndPoint: {x: 0, y: 0} + m_UseAdjacentStartPoint: 0 + m_UseAdjacentEndPoint: 0 --- !u!1 &2055826916 GameObject: m_ObjectHideFlags: 0