From 8214239346a8c749ac2e582bc044fa934d639156 Mon Sep 17 00:00:00 2001 From: cemt1363 Date: Sat, 6 Jun 2026 02:45:51 +0200 Subject: [PATCH 1/2] git die --- Game/Assets/Images/IdleAnim.anim | 108 ++++++++++++++ Game/Assets/Images/IdleAnim.anim.meta | 8 + Game/Assets/Images/Tree.controller | 102 +++++++++++++ Game/Assets/Images/Tree.controller.meta | 8 + .../Assets/Images/idle sprites_0 2.controller | 73 +++++++++ .../Images/idle sprites_0 2.controller.meta | 8 + Game/Assets/Scenes/MainScene.unity | 138 ++++++++++++++++++ 7 files changed, 445 insertions(+) create mode 100644 Game/Assets/Images/IdleAnim.anim create mode 100644 Game/Assets/Images/IdleAnim.anim.meta create mode 100644 Game/Assets/Images/Tree.controller create mode 100644 Game/Assets/Images/Tree.controller.meta create mode 100644 Game/Assets/Images/idle sprites_0 2.controller create mode 100644 Game/Assets/Images/idle sprites_0 2.controller.meta diff --git a/Game/Assets/Images/IdleAnim.anim b/Game/Assets/Images/IdleAnim.anim new file mode 100644 index 0000000..2340d7b --- /dev/null +++ b/Game/Assets/Images/IdleAnim.anim @@ -0,0 +1,108 @@ +%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: IdleAnim + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -5254763888643210246, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - time: 0.083333336 + value: {fileID: 6308160273899767728, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - time: 0.16666667 + value: {fileID: -8810144250521748931, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - time: 0.25 + value: {fileID: 8716055518302679110, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - time: 0.33333334 + value: {fileID: -2831101797488401219, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - time: 0.41666666 + value: {fileID: 7011392334922980725, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - time: 0.5 + value: {fileID: 2847488349268310368, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - time: 0.5833333 + value: {fileID: -7052100710175725327, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - time: 0.6666667 + value: {fileID: 9099921138643276957, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - time: 0.75 + value: {fileID: 9079650132197346216, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - time: 0.8333333 + value: {fileID: -2803174831038805257, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - time: 0.9166667 + value: {fileID: -4434201147178631899, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - time: 1 + value: {fileID: 2832486465855652433, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 12 + 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 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -5254763888643210246, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - {fileID: 6308160273899767728, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - {fileID: -8810144250521748931, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - {fileID: 8716055518302679110, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - {fileID: -2831101797488401219, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - {fileID: 7011392334922980725, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - {fileID: 2847488349268310368, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - {fileID: -7052100710175725327, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - {fileID: 9099921138643276957, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - {fileID: 9079650132197346216, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - {fileID: -2803174831038805257, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - {fileID: -4434201147178631899, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + - {fileID: 2832486465855652433, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.0833334 + 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/Game/Assets/Images/IdleAnim.anim.meta b/Game/Assets/Images/IdleAnim.anim.meta new file mode 100644 index 0000000..a411f80 --- /dev/null +++ b/Game/Assets/Images/IdleAnim.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 155766a386f1556489b5dd4391116403 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Images/Tree.controller b/Game/Assets/Images/Tree.controller new file mode 100644 index 0000000..dea4781 --- /dev/null +++ b/Game/Assets/Images/Tree.controller @@ -0,0 +1,102 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-5772457047735733431 +AnimatorStateMachine: + serializedVersion: 7 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 8236103331657372146} + m_Position: {x: 200, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1126839341574743841} + m_Position: {x: 235, y: 65, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + 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: 8236103331657372146} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Tree + serializedVersion: 6 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -5772457047735733431} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + m_EvaluateTransitionsOnStart: 1 +--- !u!1102 &1126839341574743841 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: IDLE 0 + 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: 690f4f6ba2c1a4944ac1e7c986ca70fc, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &8236103331657372146 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: IDLE + 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: 690f4f6ba2c1a4944ac1e7c986ca70fc, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Game/Assets/Images/Tree.controller.meta b/Game/Assets/Images/Tree.controller.meta new file mode 100644 index 0000000..f97671a --- /dev/null +++ b/Game/Assets/Images/Tree.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 84a0b0c17d2112c46a707a111ab670a9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Images/idle sprites_0 2.controller b/Game/Assets/Images/idle sprites_0 2.controller new file mode 100644 index 0000000..be3db1d --- /dev/null +++ b/Game/Assets/Images/idle sprites_0 2.controller @@ -0,0 +1,73 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-3393340397108767926 +AnimatorStateMachine: + serializedVersion: 7 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 3384176208710211919} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + 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: 3384176208710211919} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: idle sprites_0 2 + serializedVersion: 6 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -3393340397108767926} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + m_EvaluateTransitionsOnStart: 1 +--- !u!1102 &3384176208710211919 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: IdleAnim + 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: 155766a386f1556489b5dd4391116403, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Game/Assets/Images/idle sprites_0 2.controller.meta b/Game/Assets/Images/idle sprites_0 2.controller.meta new file mode 100644 index 0000000..af3896a --- /dev/null +++ b/Game/Assets/Images/idle sprites_0 2.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d099f4c53e520fc41a58cecaa11501ca +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Scenes/MainScene.unity b/Game/Assets/Scenes/MainScene.unity index efde622..d5ff3bb 100644 --- a/Game/Assets/Scenes/MainScene.unity +++ b/Game/Assets/Scenes/MainScene.unity @@ -293,6 +293,7 @@ GameObject: m_Component: - component: {fileID: 357828119} - component: {fileID: 357828118} + - component: {fileID: 357828120} m_Layer: 0 m_Name: Tree m_TagString: Untagged @@ -374,6 +375,28 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &357828120 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 357828117} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 84a0b0c17d2112c46a707a111ab670a9, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &505713147 GameObject: m_ObjectHideFlags: 0 @@ -511,6 +534,120 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &917193058 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 917193061} + - component: {fileID: 917193060} + - component: {fileID: 917193059} + m_Layer: 0 + m_Name: idle sprites_0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!95 &917193059 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 917193058} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: d099f4c53e520fc41a58cecaa11501ca, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!212 &917193060 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 917193058} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_Sprite: {fileID: -5254763888643210246, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.74, y: 10.8} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 +--- !u!4 &917193061 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 917193058} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.5, y: -1.41, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1124127124 stripped Transform: m_CorrespondingSourceObject: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} @@ -682,3 +819,4 @@ SceneRoots: - {fileID: 279662124} - {fileID: 357828119} - {fileID: 2072448676} + - {fileID: 917193061} From 690ac9e8f99dfe9c0be747e110272b6ce08a5dfe Mon Sep 17 00:00:00 2001 From: orsolya-st Date: Sat, 6 Jun 2026 02:46:15 +0200 Subject: [PATCH 2/2] dropdown error fix --- Game/Assets/Scripts/DropletMovement.cs | 4 ++-- Game/ProjectSettings/EditorSettings.asset | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs index 04f67e2..a34c880 100644 --- a/Game/Assets/Scripts/DropletMovement.cs +++ b/Game/Assets/Scripts/DropletMovement.cs @@ -43,7 +43,8 @@ public class DropletMovement : MonoBehaviour if (isGrounded && (Input.GetKeyDown(KeyCode.Space) || Input.GetKeyDown(KeyCode.UpArrow) || - Input.GetKeyDown(KeyCode.W))) + Input.GetKeyDown(KeyCode.W)) + && !isDropping) { rb.linearVelocity = new Vector2(rb.linearVelocity.x, jumpingPower); } @@ -150,6 +151,5 @@ public class DropletMovement : MonoBehaviour rb.gravityScale = 1; playerCollider.isTrigger = false; isDropping = false; - } } \ No newline at end of file diff --git a/Game/ProjectSettings/EditorSettings.asset b/Game/ProjectSettings/EditorSettings.asset index 5a91c95..b00a6a7 100644 --- a/Game/ProjectSettings/EditorSettings.asset +++ b/Game/ProjectSettings/EditorSettings.asset @@ -27,7 +27,7 @@ EditorSettings: m_UnlockBlockShaders: 0 m_PrefabModeAllowAutoSave: 1 m_EnterPlayModeOptionsEnabled: 1 - m_EnterPlayModeOptions: 0 + m_EnterPlayModeOptions: 3 m_GameObjectNamingDigits: 1 m_GameObjectNamingScheme: 0 m_AssetNamingUsesSpace: 1