From 86930521091246d27f2ab4259ccc8cf1c5f48a7a Mon Sep 17 00:00:00 2001 From: orsolya-st Date: Sat, 6 Jun 2026 11:46:39 +0200 Subject: [PATCH 1/3] physics update --- Game/Assets/Materials/droplet_mat.physicsMaterial2D | 2 +- Game/Assets/Prefabs/PlayerDroplet.prefab | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Game/Assets/Materials/droplet_mat.physicsMaterial2D b/Game/Assets/Materials/droplet_mat.physicsMaterial2D index c6e2ef8..234c603 100644 --- a/Game/Assets/Materials/droplet_mat.physicsMaterial2D +++ b/Game/Assets/Materials/droplet_mat.physicsMaterial2D @@ -9,6 +9,6 @@ PhysicsMaterial2D: m_Name: droplet_mat serializedVersion: 2 friction: 0.4 - bounciness: 0.4 + bounciness: 0.2 m_FrictionCombine: 1 m_BounceCombine: 4 diff --git a/Game/Assets/Prefabs/PlayerDroplet.prefab b/Game/Assets/Prefabs/PlayerDroplet.prefab index 116eab7..c2590f2 100644 --- a/Game/Assets/Prefabs/PlayerDroplet.prefab +++ b/Game/Assets/Prefabs/PlayerDroplet.prefab @@ -107,11 +107,11 @@ Rigidbody2D: m_BodyType: 0 m_Simulated: 1 m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 + m_UseAutoMass: 1 m_Mass: 1 m_LinearDamping: 0 m_AngularDamping: 0.05 - m_GravityScale: 1 + m_GravityScale: 1.6 m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -181,7 +181,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 64d83d81ffe9aeb419af4eb171357948, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::DropletMovement - jumpingPower: 7 + jumpingPower: 9 moveSpeed: 5 dashingPower: 24 dashingTime: 0.2 From c11efa5f0823b62b28713da109908e1893f1c721 Mon Sep 17 00:00:00 2001 From: orsolya-st Date: Sat, 6 Jun 2026 11:50:20 +0200 Subject: [PATCH 2/3] camera fix --- Game/Assets/Scenes/MainScene.unity | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Game/Assets/Scenes/MainScene.unity b/Game/Assets/Scenes/MainScene.unity index 4a24f8c..9c9df43 100644 --- a/Game/Assets/Scenes/MainScene.unity +++ b/Game/Assets/Scenes/MainScene.unity @@ -422,7 +422,7 @@ Transform: m_GameObject: {fileID: 505713147} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.361964, y: 4.1920695, z: -10} + m_LocalPosition: {x: -0.36380672, y: 4.1920695, z: -9.165956} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -535,7 +535,7 @@ Transform: m_GameObject: {fileID: 750131489} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.361964, y: 4.1920695, z: -10} + m_LocalPosition: {x: -0.3638065, y: 4.1920695, z: -9.165956} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -555,9 +555,9 @@ MonoBehaviour: m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineFollow TrackerSettings: BindingMode: 5 - PositionDamping: {x: 1, y: 1, z: 1} + PositionDamping: {x: 0, y: 1, z: 0} AngularDampingMode: 0 - RotationDamping: {x: 1, y: 1, z: 1} + RotationDamping: {x: 0, y: 0, z: 0} QuaternionDamping: 1 FollowOffset: {x: 0, y: 0, z: -10} --- !u!4 &1124127124 stripped From 2ddda61f4965f1cf984a977122db5a2b0cf58c3f Mon Sep 17 00:00:00 2001 From: orsolya-st Date: Sat, 6 Jun 2026 12:20:01 +0200 Subject: [PATCH 3/3] backup --- Game/Assets/Images/rechtangle_border.png | Bin 0 -> 10114 bytes Game/Assets/Images/rechtangle_border.png.meta | 156 ++++++++++++++++++ Game/Assets/Scenes/MainScene.unity | 107 ++++++++++-- 3 files changed, 252 insertions(+), 11 deletions(-) create mode 100644 Game/Assets/Images/rechtangle_border.png create mode 100644 Game/Assets/Images/rechtangle_border.png.meta diff --git a/Game/Assets/Images/rechtangle_border.png b/Game/Assets/Images/rechtangle_border.png new file mode 100644 index 0000000000000000000000000000000000000000..80421d1245ce83a2b08c65cb70eb303909ae24fa GIT binary patch literal 10114 zcmeI2ze@sP7{{OUuJe+Ul5UU)5*tcr&?dJu&pa0iX^9$+pshh@C=lYx#T+7`p{30^ zYHJBDqJN;Nwsxzr29Y{bG`PEG559vacdzfy&-42|St}L7q3IA2g^Pw>CJI_aLR68R zCwGPRlk+uRF*f#ywpM!|K|9Z7iDFdLv+D=K`^$ZpVyc)jzb}QGvHAU4y1VmHeTc*| z76}1Kne_Z&e+AkdDd7Eb_&<9pNma?Wlizl_q}t8+qvt5Yjx6DMf*&guH|bPM$o^CA zb*9>f+^U==5kai9jFiu^2NN>sQ}o-Jev`TqwdV4TEI*ofJ8( zVt!{956G`ZbDQ5no8E%_x+fz^Dm1hjKbmYV`^}@@{ZZW#(&bi^-@+ty_`_6y4s#Gd zhhrJ&03A>D1Fgd;T^KCJUIQJV<8svC>u^pd++;>%fDX{{jvo% z&~Ygh>)aSv=-mbANgOZ&MxGT8T)=P}q|p;xz+kG$KxYJsJ5mBV{|B84Z7#`+X72XP Pxl~8Rd`Z7rF^_)$6e5%O literal 0 HcmV?d00001 diff --git a/Game/Assets/Images/rechtangle_border.png.meta b/Game/Assets/Images/rechtangle_border.png.meta new file mode 100644 index 0000000..e15131f --- /dev/null +++ b/Game/Assets/Images/rechtangle_border.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: de5b5157d5e6c184999fbd2fa136aca8 +TextureImporter: + internalIDToNameTable: + - first: + 213: -8969500473317401404 + second: rechtangle_border_0 + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: rechtangle_border_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1920 + height: 280 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 4ccd73b87dee58380800000000000000 + internalID: -8969500473317401404 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + rechtangle_border_0: -8969500473317401404 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Scenes/MainScene.unity b/Game/Assets/Scenes/MainScene.unity index 9c9df43..10868fe 100644 --- a/Game/Assets/Scenes/MainScene.unity +++ b/Game/Assets/Scenes/MainScene.unity @@ -119,6 +119,11 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!4 &150736128 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} + m_PrefabInstance: {fileID: 3635665845719097076} + m_PrefabAsset: {fileID: 0} --- !u!1001 &274994935 PrefabInstance: m_ObjectHideFlags: 0 @@ -422,10 +427,11 @@ Transform: m_GameObject: {fileID: 505713147} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.36380672, y: 4.1920695, z: -9.165956} + m_LocalPosition: {x: -0.06485796, y: 4.1920695, z: -9.029667} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 150736128} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &505713152 @@ -535,7 +541,7 @@ Transform: m_GameObject: {fileID: 750131489} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.3638065, y: 4.1920695, z: -9.165956} + m_LocalPosition: {x: -0.06485796, y: 4.1920695, z: -9.029667} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -560,6 +566,85 @@ MonoBehaviour: RotationDamping: {x: 0, y: 0, z: 0} QuaternionDamping: 1 FollowOffset: {x: 0, y: 0, z: -10} +--- !u!1 &1013054605 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1013054608} + - component: {fileID: 1013054607} + - component: {fileID: 1013054606} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1013054606 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1013054605} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.UI.InputSystemUIInputModule + m_SendPointerHoverToParent: 1 + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 + m_CursorLockBehavior: 0 + m_ScrollDeltaPerTick: 6 +--- !u!114 &1013054607 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1013054605} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.EventSystems.EventSystem + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1013054608 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1013054605} + serializedVersion: 2 + 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_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} @@ -786,7 +871,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 505713151} m_Modifications: - target: {fileID: 2217298787221768457, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} propertyPath: m_Name @@ -798,15 +883,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 0.36380672 objectReference: {fileID: 0} - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} propertyPath: m_LocalPosition.y - value: -4.2709 + value: -4.1920695 objectReference: {fileID: 0} - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 9.165956 objectReference: {fileID: 0} - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} propertyPath: m_LocalRotation.w @@ -814,15 +899,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -848,6 +933,6 @@ SceneRoots: - {fileID: 505713151} - {fileID: 357828119} - {fileID: 2072448676} - - {fileID: 3635665845719097076} - {fileID: 1445156949} - {fileID: 750131492} + - {fileID: 1013054608}