From e19de3acd939be7cdf528c47d47df72db4468451 Mon Sep 17 00:00:00 2001 From: zhangaotian <8474238@qq.com> Date: Mon, 24 Jun 2024 19:51:39 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=85=B3=E5=8D=A1=E5=86=85=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 调整资源大小、间距 --- .../Assets/Art/LevelItem/HoleOfPlank.prefab | 2 +- Forest/Assets/Art/LevelItem/Kong.prefab | 2 +- .../Assets/Art/LevelItem/Plank/Circle.prefab | 6 +-- .../Plank/HorizontalSquareWithFive.prefab | 32 +++++++------- .../Plank/HorizontalSquareWithFour.prefab | 34 +++++++-------- .../Plank/HorizontalSquareWithThree.prefab | 30 ++++++------- .../Plank/HorizontalSquareWithTwo.prefab | 33 +++++++------- .../Plank/InclinedSquareToLeft.prefab | 31 ++++++------- .../Plank/InclinedSquareToRight.prefab | 31 +++++++------ .../LevelItem/Plank/InclinedTriangle.prefab | 14 +++--- .../Plank/InclinedTriangle_180.prefab | 14 +++--- .../Plank/InclinedTriangle_270.prefab | 14 +++--- .../Plank/InclinedTriangle_90.prefab | 14 +++--- .../Art/LevelItem/Plank/MultiSquare.prefab | 34 +++++++-------- .../Plank/RightTriangleToLeft.prefab | 32 +++++++------- .../Plank/RightTriangleToLeft_Down.prefab | 27 ++++++------ .../Plank/RightTriangleToRight.prefab | 16 +++---- .../Plank/RightTriangleToRight_Down.prefab | 16 +++---- .../Plank/VerticalSquareWithFive.prefab | 40 ++++++++--------- .../Plank/VerticalSquareWithFour.prefab | 43 +++++++++---------- .../Plank/VerticalSquareWithThree.prefab | 38 ++++++++-------- .../Plank/VerticalSquareWithTwo.prefab | 39 ++++++++--------- .../Art/Texture/LevelItem/LR_Hole.png.meta | 2 +- .../Art/Texture/LevelItem/LR_Hole86.png.meta | 2 +- .../Texture/LevelItem/LR_Thumbtack.png.meta | 2 +- .../LevelItem/Plank/LR_Circle.png.meta | 2 +- .../LR_HorizontalSquareWithFive.png.meta | 2 +- .../LR_HorizontalSquareWithFour.png.meta | 2 +- .../LR_HorizontalSquareWithThree.png.meta | 2 +- .../Plank/LR_HorizontalSquareWithTwo.png.meta | 2 +- .../Plank/LR_InclinedSquareToLeft.png.meta | 2 +- .../Plank/LR_InclinedSquareToRight.png.meta | 2 +- .../Plank/LR_InclinedTriangle.png.meta | 2 +- .../LevelItem/Plank/LR_MultiSquare.png.meta | 2 +- .../LevelItem/Plank/LR_RightTriangle.png.meta | 2 +- .../Plank/LR_VerticalSquareWithFive.png.meta | 2 +- .../Plank/LR_VerticalSquareWithFour.png.meta | 2 +- .../Plank/LR_VerticalSquareWithThree.png.meta | 2 +- .../Plank/LR_VerticalSquareWithTwo.png.meta | 2 +- .../Assets/Editor/Level/GeneratorScene.unity | 5 ++- .../Framework/Constants/Constants.Level.cs | 6 +-- Forest/Assets/Scripts/Gameplay/Level/Level.cs | 1 - 42 files changed, 283 insertions(+), 305 deletions(-) diff --git a/Forest/Assets/Art/LevelItem/HoleOfPlank.prefab b/Forest/Assets/Art/LevelItem/HoleOfPlank.prefab index bdff28a..d1500de 100644 --- a/Forest/Assets/Art/LevelItem/HoleOfPlank.prefab +++ b/Forest/Assets/Art/LevelItem/HoleOfPlank.prefab @@ -119,4 +119,4 @@ CircleCollider2D: m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} serializedVersion: 2 - m_Radius: 0.49999997 + m_Radius: 0.172 diff --git a/Forest/Assets/Art/LevelItem/Kong.prefab b/Forest/Assets/Art/LevelItem/Kong.prefab index 445ae54..5975829 100644 --- a/Forest/Assets/Art/LevelItem/Kong.prefab +++ b/Forest/Assets/Art/LevelItem/Kong.prefab @@ -121,7 +121,7 @@ CircleCollider2D: m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} serializedVersion: 2 - m_Radius: 0.25 + m_Radius: 0.192 --- !u!1 &2682701998072949621 GameObject: m_ObjectHideFlags: 0 diff --git a/Forest/Assets/Art/LevelItem/Plank/Circle.prefab b/Forest/Assets/Art/LevelItem/Plank/Circle.prefab index c59bd0f..38d5aeb 100644 --- a/Forest/Assets/Art/LevelItem/Plank/Circle.prefab +++ b/Forest/Assets/Art/LevelItem/Plank/Circle.prefab @@ -112,7 +112,7 @@ Rigidbody2D: m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 - m_Constraints: 0 + m_Constraints: 4 --- !u!58 &8648559828217208200 CircleCollider2D: m_ObjectHideFlags: 0 @@ -145,6 +145,6 @@ CircleCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: -0.003906333, y: 0} serializedVersion: 2 - m_Radius: 0.5 + m_Radius: 0.41796717 diff --git a/Forest/Assets/Art/LevelItem/Plank/HorizontalSquareWithFive.prefab b/Forest/Assets/Art/LevelItem/Plank/HorizontalSquareWithFive.prefab index c07f97c..1acec45 100644 --- a/Forest/Assets/Art/LevelItem/Plank/HorizontalSquareWithFive.prefab +++ b/Forest/Assets/Art/LevelItem/Plank/HorizontalSquareWithFive.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 2679211729297630658} - component: {fileID: 6415897664040322337} - component: {fileID: 7374207811072393287} - - component: {fileID: 6483766764769997426} + - component: {fileID: 4897515517417687263} m_Layer: 6 m_Name: HorizontalSquareWithFive m_TagString: Untagged @@ -113,7 +113,7 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!60 &6483766764769997426 +--- !u!60 &4897515517417687263 PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -149,7 +149,7 @@ PolygonCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 4.1285715, y: 0.6857143} + oldSize: {x: 3.8533332, y: 0.64} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -157,17 +157,17 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: 1.9900905, y: 0.29039043} - - {x: 1.9023811, y: 0.33558562} - - {x: -1.8668467, y: 0.34306458} - - {x: -1.9413879, y: 0.3175281} - - {x: -2.0032532, y: 0.2778683} - - {x: -2.061753, y: 0.21155053} - - {x: -2.0642858, y: -0.22097273} - - {x: -1.9997909, y: -0.3037359} - - {x: -1.9256843, y: -0.34539005} - - {x: 1.9309524, y: -0.34285715} - - {x: 1.9992404, y: -0.29209736} - - {x: 2.0642858, y: -0.22857144} - - {x: 2.059438, y: 0.19974272} + - - {x: -1.8072273, y: 0.32178992} + - {x: -1.8809141, y: 0.27973998} + - {x: -1.9284567, y: 0.2130293} + - {x: -1.9248149, y: -0.20963049} + - {x: -1.8790115, y: -0.27475056} + - {x: -1.8559264, y: -0.30444482} + - {x: -1.816668, y: -0.3162964} + - {x: 1.8128988, y: -0.3251236} + - {x: 1.877049, y: -0.27833647} + - {x: 1.9292285, y: -0.20743549} + - {x: 1.9348794, y: 0.20956948} + - {x: 1.883116, y: 0.28240693} + - {x: 1.8146266, y: 0.32} m_UseDelaunayMesh: 0 diff --git a/Forest/Assets/Art/LevelItem/Plank/HorizontalSquareWithFour.prefab b/Forest/Assets/Art/LevelItem/Plank/HorizontalSquareWithFour.prefab index 2340290..44cbf58 100644 --- a/Forest/Assets/Art/LevelItem/Plank/HorizontalSquareWithFour.prefab +++ b/Forest/Assets/Art/LevelItem/Plank/HorizontalSquareWithFour.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 8263949795113199415} - component: {fileID: 4961264709083464579} - component: {fileID: 7636208566460867025} - - component: {fileID: 8174625132704750894} + - component: {fileID: 7597807734224429326} m_Layer: 6 m_Name: HorizontalSquareWithFour m_TagString: Untagged @@ -113,7 +113,7 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!60 &8174625132704750894 +--- !u!60 &7597807734224429326 PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -149,7 +149,7 @@ PolygonCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 3.2761905, y: 0.6857143} + oldSize: {x: 3.057778, y: 0.64} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -157,20 +157,16 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: 1.6128243, y: 0.25401664} - - {x: 1.5453343, y: 0.31544676} - - {x: 1.4748741, y: 0.3444348} - - {x: -1.4762024, y: 0.3510812} - - {x: -1.5777857, y: 0.28729764} - - {x: -1.6404911, y: 0.1924935} - - {x: -1.6353539, y: -0.20938204} - - {x: -1.6142858, y: -0.26666668} - - {x: -1.5666667, y: -0.31904763} - - {x: -1.5476191, y: -0.33333334} - - {x: -1.5238096, y: -0.34285715} - - {x: 1.5333334, y: -0.34285715} - - {x: 1.5493418, y: -0.32702285} - - {x: 1.5934488, y: -0.29072377} - - {x: 1.6396729, y: -0.21916375} - - {x: 1.6380953, y: 0.20020323} + - - {x: -1.4163126, y: 0.32186434} + - {x: -1.4933155, y: 0.2760765} + - {x: -1.5326176, y: 0.21130235} + - {x: -1.528889, y: -0.21015376} + - {x: -1.498256, y: -0.26601803} + - {x: -1.4108696, y: -0.32186437} + - {x: 1.4119982, y: -0.32} + - {x: 1.4809186, y: -0.27273843} + - {x: 1.5200219, y: -0.19566524} + - {x: 1.5318446, y: 0.18237585} + - {x: 1.4806892, y: 0.27873546} + - {x: 1.4075977, y: 0.32} m_UseDelaunayMesh: 0 diff --git a/Forest/Assets/Art/LevelItem/Plank/HorizontalSquareWithThree.prefab b/Forest/Assets/Art/LevelItem/Plank/HorizontalSquareWithThree.prefab index aff329b..37e1c44 100644 --- a/Forest/Assets/Art/LevelItem/Plank/HorizontalSquareWithThree.prefab +++ b/Forest/Assets/Art/LevelItem/Plank/HorizontalSquareWithThree.prefab @@ -149,7 +149,7 @@ PolygonCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 2.5285714, y: 0.6857143} + oldSize: {x: 2.36, y: 0.64} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -157,18 +157,18 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: 1.2418982, y: 0.26190478} - - {x: 1.1704696, y: 0.33005536} - - {x: 1.1452382, y: 0.34285715} - - {x: -1.1386201, y: 0.34285715} - - {x: -1.1907626, y: 0.3129519} - - {x: -1.2387441, y: 0.2632646} - - {x: -1.2626778, y: 0.20438972} - - {x: -1.2626778, y: -0.22015935} - - {x: -1.2355596, y: -0.28394184} - - {x: -1.1799933, y: -0.34285715} - - {x: 1.1833334, y: -0.34285715} - - {x: 1.2165427, y: -0.30630785} - - {x: 1.2642858, y: -0.22652921} - - {x: 1.2675017, y: 0.20593566} + - - {x: 1.1647434, y: 0.25294712} + - {x: 1.1256814, y: 0.28526708} + - {x: 1.068678, y: 0.32474363} + - {x: -1.0593767, y: 0.32646194} + - {x: -1.1118901, y: 0.30596673} + - {x: -1.1588856, y: 0.25779948} + - {x: -1.1910166, y: 0.18647444} + - {x: -1.1910166, y: -0.17984992} + - {x: -1.1683773, y: -0.24363238} + - {x: -1.0904168, y: -0.32494187} + - {x: 1.0793055, y: -0.32127956} + - {x: 1.1367403, y: -0.28289902} + - {x: 1.1800045, y: -0.20455515} + - {x: 1.1846553, y: 0.18292327} m_UseDelaunayMesh: 0 diff --git a/Forest/Assets/Art/LevelItem/Plank/HorizontalSquareWithTwo.prefab b/Forest/Assets/Art/LevelItem/Plank/HorizontalSquareWithTwo.prefab index c876f59..ecc3859 100644 --- a/Forest/Assets/Art/LevelItem/Plank/HorizontalSquareWithTwo.prefab +++ b/Forest/Assets/Art/LevelItem/Plank/HorizontalSquareWithTwo.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 5686909082006845629} - component: {fileID: 1244934693077083203} - component: {fileID: 8736177939847602354} - - component: {fileID: 3764056797390962137} + - component: {fileID: 1232130139076391666} m_Layer: 6 m_Name: HorizontalSquareWithTwo m_TagString: Untagged @@ -113,7 +113,7 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!60 &3764056797390962137 +--- !u!60 &1232130139076391666 PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -149,7 +149,7 @@ PolygonCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1.752381, y: 0.6857143} + oldSize: {x: 1.6355555, y: 0.64} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -157,19 +157,16 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: -0.7415118, y: 0.34307674} - - {x: -0.7840856, y: 0.33330852} - - {x: -0.8380704, y: 0.2777198} - - {x: -0.8745991, y: 0.22695515} - - {x: -0.87418455, y: -0.21193103} - - {x: -0.82037735, y: -0.30147967} - - {x: -0.75904554, y: -0.3407558} - - {x: 0.7662518, y: -0.33784962} - - {x: 0.8279631, y: -0.29039136} - - {x: 0.8792617, y: -0.22253923} - - {x: 0.88120764, y: -0.22881413} - - {x: 0.8781964, y: -0.24107769} - - {x: 0.8793994, y: 0.19995269} - - {x: 0.84438473, y: 0.272086} - - {x: 0.7631232, y: 0.34085122} + - - {x: 0.8133138, y: 0.23332353} + - {x: 0.71083677, y: 0.32} + - {x: -0.69820637, y: 0.32534683} + - {x: -0.773328, y: 0.28621817} + - {x: -0.82142836, y: 0.18764348} + - {x: -0.82133377, y: -0.20887929} + - {x: -0.78044534, y: -0.26843828} + - {x: -0.7086709, y: -0.32049844} + - {x: 0.72444445, y: -0.32} + - {x: 0.75111115, y: -0.30222222} + - {x: 0.8044445, y: -0.25333333} + - {x: 0.8177778, y: -0.21777779} m_UseDelaunayMesh: 0 diff --git a/Forest/Assets/Art/LevelItem/Plank/InclinedSquareToLeft.prefab b/Forest/Assets/Art/LevelItem/Plank/InclinedSquareToLeft.prefab index f6f66f2..76041d7 100644 --- a/Forest/Assets/Art/LevelItem/Plank/InclinedSquareToLeft.prefab +++ b/Forest/Assets/Art/LevelItem/Plank/InclinedSquareToLeft.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 1996775789584887722} - component: {fileID: 8398904423136208247} - component: {fileID: 2402092432367201532} - - component: {fileID: 4340935752876842052} + - component: {fileID: 3949754254180218524} m_Layer: 6 m_Name: InclinedSquareToLeft m_TagString: Untagged @@ -113,7 +113,7 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!60 &4340935752876842052 +--- !u!60 &3949754254180218524 PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -149,7 +149,7 @@ PolygonCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1.6722223, y: 1.6722223} + oldSize: {x: 1.505, y: 1.505} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -157,18 +157,15 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: -0.39221492, y: 0.83029395} - - {x: -0.4608085, y: 0.83969146} - - {x: -0.5417386, y: 0.8300912} - - {x: -0.69305843, y: 0.6784141} - - {x: -0.83758676, y: 0.528057} - - {x: -0.8386002, y: 0.43993664} - - {x: -0.83182836, y: 0.39861548} - - {x: -0.6181895, y: 0.17583948} - - {x: 0.37891388, y: -0.82540125} - - {x: 0.4167343, y: -0.8417007} - - {x: 0.52674484, y: -0.8361456} - - {x: 0.83055556, y: -0.54722226} - - {x: 0.8361111, y: -0.5361111} - - {x: 0.83648, y: -0.41186795} + - - {x: 0.73249996, y: -0.3275} + - {x: -0.33249998, y: 0.7375} + - {x: -0.3678536, y: 0.7525} + - {x: -0.4847348, y: 0.7525} + - {x: -0.7556484, y: 0.48601186} + - {x: -0.7562942, y: 0.3628536} + - {x: 0.34914097, y: -0.7473177} + - {x: 0.46753842, y: -0.76027346} + - {x: 0.7475, y: -0.4860413} + - {x: 0.7525, y: -0.48749998} + - {x: 0.74731773, y: -0.35509118} m_UseDelaunayMesh: 0 diff --git a/Forest/Assets/Art/LevelItem/Plank/InclinedSquareToRight.prefab b/Forest/Assets/Art/LevelItem/Plank/InclinedSquareToRight.prefab index 004ffb1..69a4913 100644 --- a/Forest/Assets/Art/LevelItem/Plank/InclinedSquareToRight.prefab +++ b/Forest/Assets/Art/LevelItem/Plank/InclinedSquareToRight.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 6571598824364239088} - component: {fileID: 90335612671103237} - component: {fileID: 4493264358871090597} - - component: {fileID: 5225211343666280555} + - component: {fileID: 7825118413652281522} m_Layer: 6 m_Name: InclinedSquareToRight m_TagString: Untagged @@ -113,7 +113,7 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!60 &5225211343666280555 +--- !u!60 &7825118413652281522 PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -149,7 +149,7 @@ PolygonCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1.6722223, y: 1.6722223} + oldSize: {x: 1.505, y: 1.505} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -157,17 +157,16 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: 0.5360054, y: 0.83858615} - - {x: 0.4027778, y: 0.8361111} - - {x: 0.36944446, y: 0.8194445} - - {x: -0.8138889, y: -0.3638889} - - {x: -0.82770586, y: -0.41528976} - - {x: -0.83330935, y: -0.51640296} - - {x: -0.8160408, y: -0.5529306} - - {x: -0.54804265, y: -0.8274688} - - {x: -0.46121156, y: -0.83944654} - - {x: -0.39804634, y: -0.8332304} - - {x: 0.8324251, y: 0.40161964} - - {x: 0.8361111, y: 0.39722222} - - {x: 0.8361111, y: 0.5181276} + - - {x: 0.47950834, y: 0.75093865} + - {x: 0.36249998, y: 0.7525} + - {x: 0.33249998, y: 0.7375} + - {x: -0.73249996, y: -0.3275} + - {x: -0.7525, y: -0.3725} + - {x: -0.75061774, y: -0.48308897} + - {x: -0.4916805, y: -0.7449712} + - {x: -0.43552753, y: -0.7557935} + - {x: -0.35255763, y: -0.7468534} + - {x: 0.7425, y: 0.33249998} + - {x: 0.7525, y: 0.3575} + - {x: 0.7575906, y: 0.4898641} m_UseDelaunayMesh: 0 diff --git a/Forest/Assets/Art/LevelItem/Plank/InclinedTriangle.prefab b/Forest/Assets/Art/LevelItem/Plank/InclinedTriangle.prefab index dcaf3ab..1e77e30 100644 --- a/Forest/Assets/Art/LevelItem/Plank/InclinedTriangle.prefab +++ b/Forest/Assets/Art/LevelItem/Plank/InclinedTriangle.prefab @@ -149,7 +149,7 @@ PolygonCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 1} - oldSize: {x: 2.7282052, y: 1.5692308} + oldSize: {x: 2.5333333, y: 1.4571428} newSize: {x: 1, y: 0.8671875} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -158,11 +158,11 @@ PolygonCollider2D: m_Points: m_Paths: - - {x: -0.050077192, y: 0} - - {x: -1.3623625, y: -1.3210686} - - {x: -1.3588824, y: -1.5137327} - - {x: -1.3000882, y: -1.5674907} - - {x: 1.3072782, y: -1.5719517} - - {x: 1.3668234, y: -1.5009966} - - {x: 1.3641026, y: -1.3210838} + - {x: -1.2713782, y: -1.2073381} + - {x: -1.2711475, y: -1.3902539} + - {x: -1.225351, y: -1.4602591} + - {x: 1.2158817, y: -1.4698027} + - {x: 1.2728717, y: -1.4005655} + - {x: 1.2701508, y: -1.217413} - {x: 0.05396176, y: -0.002559483} m_UseDelaunayMesh: 0 diff --git a/Forest/Assets/Art/LevelItem/Plank/InclinedTriangle_180.prefab b/Forest/Assets/Art/LevelItem/Plank/InclinedTriangle_180.prefab index 60ac75f..dca5c23 100644 --- a/Forest/Assets/Art/LevelItem/Plank/InclinedTriangle_180.prefab +++ b/Forest/Assets/Art/LevelItem/Plank/InclinedTriangle_180.prefab @@ -149,7 +149,7 @@ PolygonCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 1} - oldSize: {x: 2.7282052, y: 1.5692308} + oldSize: {x: 2.5333333, y: 1.4571428} newSize: {x: 1, y: 0.8671875} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -158,11 +158,11 @@ PolygonCollider2D: m_Points: m_Paths: - - {x: -0.06835154, y: 0.00555861} - - {x: -1.3696611, y: -1.3299636} - - {x: -1.3585441, y: -1.53674} - - {x: -1.2991208, y: -1.5692308} - - {x: 1.2962744, y: -1.5738752} - - {x: 1.3594582, y: -1.5212384} - - {x: 1.3645964, y: -1.3171881} + - {x: -1.2724689, y: -1.2165726} + - {x: -1.272151, y: -1.4071504} + - {x: -1.223527, y: -1.4612396} + - {x: 1.2124254, y: -1.4635475} + - {x: 1.2676655, y: -1.3916489} + - {x: 1.2688577, y: -1.2238898} - {x: 0.04568664, y: 0.01667589} m_UseDelaunayMesh: 0 diff --git a/Forest/Assets/Art/LevelItem/Plank/InclinedTriangle_270.prefab b/Forest/Assets/Art/LevelItem/Plank/InclinedTriangle_270.prefab index 41d1d0c..abd680d 100644 --- a/Forest/Assets/Art/LevelItem/Plank/InclinedTriangle_270.prefab +++ b/Forest/Assets/Art/LevelItem/Plank/InclinedTriangle_270.prefab @@ -149,7 +149,7 @@ PolygonCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 1} - oldSize: {x: 2.7282052, y: 1.5692308} + oldSize: {x: 2.5333333, y: 1.4571428} newSize: {x: 1, y: 0.8671875} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -158,11 +158,11 @@ PolygonCollider2D: m_Points: m_Paths: - - {x: -0.04185988, y: 0.0032255147} - - {x: -1.3589879, y: -1.3049601} - - {x: -1.36666, y: -1.5027121} - - {x: -1.2949996, y: -1.5717882} - - {x: 1.3027965, y: -1.5666772} - - {x: 1.356442, y: -1.5205444} - - {x: 1.3692098, y: -1.3177376} + - {x: -1.2743498, y: -1.2240016} + - {x: -1.2736055, y: -1.399802} + - {x: -1.2087803, y: -1.464014} + - {x: 1.1896337, y: -1.4696804} + - {x: 1.2702227, y: -1.4127704} + - {x: 1.2745248, y: -1.21797} - {x: 0.050213553, y: -0.0032254832} m_UseDelaunayMesh: 0 diff --git a/Forest/Assets/Art/LevelItem/Plank/InclinedTriangle_90.prefab b/Forest/Assets/Art/LevelItem/Plank/InclinedTriangle_90.prefab index 725392f..b7e1ee2 100644 --- a/Forest/Assets/Art/LevelItem/Plank/InclinedTriangle_90.prefab +++ b/Forest/Assets/Art/LevelItem/Plank/InclinedTriangle_90.prefab @@ -149,7 +149,7 @@ PolygonCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 1} - oldSize: {x: 2.7282052, y: 1.5692308} + oldSize: {x: 2.5333333, y: 1.4571428} newSize: {x: 1, y: 0.8671875} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -158,11 +158,11 @@ PolygonCollider2D: m_Points: m_Paths: - - {x: -0.04831227, y: -0.0033951774} - - {x: -1.3641026, y: -1.3157195} - - {x: -1.3708929, y: -1.5148371} - - {x: -1.2994525, y: -1.572626} - - {x: 1.2876759, y: -1.5794163} - - {x: 1.3641026, y: -1.5112293} - - {x: 1.3607075, y: -1.3074087} + - {x: -1.2705002, y: -1.1987165} + - {x: -1.2694901, y: -1.4134344} + - {x: -1.2136502, y: -1.4634231} + - {x: 1.2057737, y: -1.4624131} + - {x: 1.2744002, y: -1.4098266} + - {x: 1.2710053, y: -1.2099061} - {x: 0.053440467, y: -0.0033951625} m_UseDelaunayMesh: 0 diff --git a/Forest/Assets/Art/LevelItem/Plank/MultiSquare.prefab b/Forest/Assets/Art/LevelItem/Plank/MultiSquare.prefab index 9d2f95b..8a02171 100644 --- a/Forest/Assets/Art/LevelItem/Plank/MultiSquare.prefab +++ b/Forest/Assets/Art/LevelItem/Plank/MultiSquare.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 6324175789410968358} - component: {fileID: 7487142658878049838} - component: {fileID: -1833454199839226994} - - component: {fileID: 3334327379135730870} + - component: {fileID: 3610801055333837286} m_Layer: 6 m_Name: MultiSquare m_TagString: Untagged @@ -113,7 +113,7 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!60 &3334327379135730870 +--- !u!60 &3610801055333837286 PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -149,7 +149,7 @@ PolygonCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1.6971428, y: 1.6857142} + oldSize: {x: 1.5631579, y: 1.5526316} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -157,19 +157,17 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: 0.82, y: 0.76285714} - - {x: 0.7114286, y: 0.8371428} - - {x: 0.6885714, y: 0.8428571} - - {x: -0.7052065, y: 0.8428571} - - {x: -0.7940529, y: 0.7720318} - - {x: -0.843415, y: 0.6792076} - - {x: -0.8472164, y: -0.68850905} - - {x: -0.8141074, y: -0.7461243} - - {x: -0.7497794, y: -0.8144016} - - {x: -0.68443, y: -0.8396728} - - {x: 0.6896965, y: -0.84436285} - - {x: 0.7620139, y: -0.8092331} - - {x: 0.82027227, y: -0.74146956} - - {x: 0.84556013, y: -0.70054454} - - {x: 0.8485714, y: 0.67714286} + - - {x: -0.67105263, y: 0.7763158} + - {x: -0.73509675, y: 0.71315795} + - {x: -0.78157896, y: 0.63598293} + - {x: -0.78620946, y: -0.61486757} + - {x: -0.7443615, y: -0.6947882} + - {x: -0.6723179, y: -0.76010907} + - {x: -0.6221574, y: -0.77679086} + - {x: 0.6529325, y: -0.77405673} + - {x: 0.7382666, y: -0.70894325} + - {x: 0.7815984, y: -0.64314187} + - {x: 0.783838, y: 0.62661684} + - {x: 0.7350925, y: 0.7122237} + - {x: 0.6378643, y: 0.77405673} m_UseDelaunayMesh: 0 diff --git a/Forest/Assets/Art/LevelItem/Plank/RightTriangleToLeft.prefab b/Forest/Assets/Art/LevelItem/Plank/RightTriangleToLeft.prefab index 5241503..ee712c5 100644 --- a/Forest/Assets/Art/LevelItem/Plank/RightTriangleToLeft.prefab +++ b/Forest/Assets/Art/LevelItem/Plank/RightTriangleToLeft.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 3011250659546438669} - component: {fileID: 1785301840276956174} - component: {fileID: -2677500377673285137} - - component: {fileID: 3625669346998564981} + - component: {fileID: 4910706683538781427} m_Layer: 6 m_Name: RightTriangleToLeft m_TagString: Untagged @@ -113,7 +113,7 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!60 &3625669346998564981 +--- !u!60 &4910706683538781427 PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -149,7 +149,7 @@ PolygonCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} - oldSize: {x: 1.8888888, y: 1.7888889} + oldSize: {x: 1.6190476, y: 1.5333333} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -157,17 +157,17 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: 0.008699618, y: 1.431214} - - {x: -0.00055485964, y: 1.7066596} - - {x: -0.067996, y: 1.7915794} - - {x: -0.20284645, y: 1.788156} - - {x: -0.25905973, y: 1.7824446} - - {x: -0.35694462, y: 1.6860569} - - {x: -1.8903487, y: 0.22845991} - - {x: -1.8883845, y: 0.070318006} - - {x: -1.8445153, y: 0.010765016} - - {x: -0.070405304, y: -0.00055138767} - - {x: -0.059377357, y: -0.0056547523} - - {x: -0.037225768, y: 0.017383702} - - {x: 0.0049737394, y: 0.0664579} + - - {x: -0.22384247, y: 1.5380974} + - {x: -0.066915795, y: 1.5359634} + - {x: -0.03526265, y: 1.5115309} + - {x: 0.00077567995, y: 1.4567236} + - {x: 0.00038088113, y: 1.4569211} + - {x: 0.006358534, y: 0.035966396} + - {x: 0.010692209, y: 0.038372993} + - {x: -0.030072212, y: -0.0058253035} + - {x: -1.5598463, y: -0.004918238} + - {x: -1.5900652, y: 0.017500043} + - {x: -1.6271116, y: 0.109713584} + - {x: -1.6167712, y: 0.19827111} + - {x: -0.22034925, y: 1.5320711} m_UseDelaunayMesh: 0 diff --git a/Forest/Assets/Art/LevelItem/Plank/RightTriangleToLeft_Down.prefab b/Forest/Assets/Art/LevelItem/Plank/RightTriangleToLeft_Down.prefab index ff60553..114bdd5 100644 --- a/Forest/Assets/Art/LevelItem/Plank/RightTriangleToLeft_Down.prefab +++ b/Forest/Assets/Art/LevelItem/Plank/RightTriangleToLeft_Down.prefab @@ -149,7 +149,7 @@ PolygonCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} - oldSize: {x: 1.8888888, y: 1.7888889} + oldSize: {x: 1.6190476, y: 1.5333333} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -157,17 +157,18 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: 0.0040909946, y: 1.684104} - - {x: -0.031838115, y: 1.7430557} - - {x: -0.08272919, y: 1.7827325} - - {x: -0.22933272, y: 1.7859489} - - {x: -0.2749007, y: 1.7632607} - - {x: -0.34361273, y: 1.6793909} - - {x: -1.8915536, y: 0.22207655} - - {x: -1.887782, y: 0.08210938} - - {x: -1.8118523, y: -0.0073810816} - - {x: -0.05777325, y: 0.001975013} - - {x: -0.0096854195, y: 0.06367617} - - {x: -0.010473948, y: 0.22591382} + - - {x: 0.009671571, y: 1.4553} + - {x: 0.007225953, y: 1.4528651} + - {x: -0.054826263, y: 1.5316061} + - {x: -0.1791831, y: 1.5358864} + - {x: -0.18972397, y: 1.5343999} + - {x: -0.20843771, y: 1.525276} + - {x: -1.6189309, y: 0.20069434} + - {x: -1.6231776, y: 0.060727194} + - {x: -1.5953579, y: 0.014001014} + - {x: -1.5601301, y: -0.0023738556} + - {x: -0.049754936, y: 0.001975012} + - {x: -0.0016671065, y: 0.052985065} + - {x: 0.00021714345, y: 0.23393214} - {x: -0.0075966567, y: 0.27421337} m_UseDelaunayMesh: 0 diff --git a/Forest/Assets/Art/LevelItem/Plank/RightTriangleToRight.prefab b/Forest/Assets/Art/LevelItem/Plank/RightTriangleToRight.prefab index 0f7afd8..088714f 100644 --- a/Forest/Assets/Art/LevelItem/Plank/RightTriangleToRight.prefab +++ b/Forest/Assets/Art/LevelItem/Plank/RightTriangleToRight.prefab @@ -149,7 +149,7 @@ PolygonCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} - oldSize: {x: 1.8888888, y: 1.7888889} + oldSize: {x: 1.6190476, y: 1.5333333} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -157,14 +157,14 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: 1.8908854, y: 0.21452278} - - {x: 0.24318443, y: 1.7895766} - - {x: 0.08339142, y: 1.7869735} - - {x: 0.035308495, y: 1.7417663} - - {x: -0.004919082, y: 1.6817226} + - - {x: 1.6226935, y: 0.20346332} + - {x: 0.22103234, y: 1.5237516} + - {x: 0.07231539, y: 1.5405315} + - {x: 0.029770479, y: 1.5147074} + - {x: -0.004919082, y: 1.4657397} - {x: -0.0012390539, y: 0.068011835} - {x: 0.04190004, y: 0.010389624} - {x: 0.10701895, y: 0.0014159232} - - {x: 1.8207939, y: 0.0014954209} - - {x: 1.8892633, y: 0.07758515} + - {x: 1.5802507, y: -0.0067991614} + - {x: 1.6266012, y: 0.06929051} m_UseDelaunayMesh: 0 diff --git a/Forest/Assets/Art/LevelItem/Plank/RightTriangleToRight_Down.prefab b/Forest/Assets/Art/LevelItem/Plank/RightTriangleToRight_Down.prefab index e930a2e..ebb69a2 100644 --- a/Forest/Assets/Art/LevelItem/Plank/RightTriangleToRight_Down.prefab +++ b/Forest/Assets/Art/LevelItem/Plank/RightTriangleToRight_Down.prefab @@ -149,7 +149,7 @@ PolygonCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} - oldSize: {x: 1.8888888, y: 1.7888889} + oldSize: {x: 1.6190476, y: 1.5333333} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -157,15 +157,15 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: 1.8830609, y: 0.21128817} - - {x: 0.24571323, y: 1.780138} - - {x: 0.100451544, y: 1.7892152} - - {x: 0.04200259, y: 1.7559763} - - {x: -0.0038634297, y: 1.7020917} + - - {x: 1.6173928, y: 0.21128814} + - {x: 0.21720614, y: 1.5267414} + - {x: 0.0656095, y: 1.5421535} + - {x: 0.05783992, y: 1.5279194} + - {x: -0.00069595175, y: 1.4708673} - {x: 0.0055062734, y: 0.060226485} - {x: 0.037203446, y: 0.013957461} - {x: 0.071585365, y: 0.00036388403} - {x: 0.10701895, y: 0.0014159232} - - {x: 1.8207939, y: 0.0014954209} - - {x: 1.8912896, y: 0.08333478} + - {x: 1.5646139, y: -0.007992774} + - {x: 1.6224587, y: 0.06435848} m_UseDelaunayMesh: 0 diff --git a/Forest/Assets/Art/LevelItem/Plank/VerticalSquareWithFive.prefab b/Forest/Assets/Art/LevelItem/Plank/VerticalSquareWithFive.prefab index 2fbfb9b..5a1f5ec 100644 --- a/Forest/Assets/Art/LevelItem/Plank/VerticalSquareWithFive.prefab +++ b/Forest/Assets/Art/LevelItem/Plank/VerticalSquareWithFive.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 5676947305101235831} - component: {fileID: 7880429887665502151} - component: {fileID: 5515811911121662713} - - component: {fileID: 7416860895102483635} + - component: {fileID: 887255170065290354} m_Layer: 6 m_Name: VerticalSquareWithFive m_TagString: Untagged @@ -113,7 +113,7 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!60 &7416860895102483635 +--- !u!60 &887255170065290354 PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -149,7 +149,7 @@ PolygonCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.7894737, y: 4.1842103} + oldSize: {x: 0.71428573, y: 3.7857144} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -157,24 +157,18 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: 0.30526316, y: 2.0657895} - - {x: 0.23684211, y: 2.0921054} - - {x: -0.23781495, y: 2.0852954} - - {x: -0.23998785, y: 2.0868027} - - {x: -0.30897972, y: 2.0521698} - - {x: -0.35131982, y: 2.0131938} - - {x: -0.37079716, y: 1.9758943} - - {x: -0.39473686, y: 1.9106882} - - {x: -0.39306298, y: -1.9130455} - - {x: -0.37727937, y: -1.9714315} - - {x: -0.34760994, y: -2.0161517} - - {x: -0.309771, y: -2.0532718} - - {x: -0.2626924, y: -2.0770705} - - {x: -0.21664315, y: -2.0904315} - - {x: 0.24374539, y: -2.0897174} - - {x: 0.3017766, y: -2.0605297} - - {x: 0.33400902, y: -2.0313084} - - {x: 0.37143606, y: -1.9818345} - - {x: 0.39724067, y: -1.9179361} - - {x: 0.39473686, y: 1.95} + - - {x: 0.22531188, y: 1.8915231} + - {x: -0.22066931, y: 1.8920716} + - {x: -0.2859392, y: 1.8496685} + - {x: -0.33165357, y: 1.8001443} + - {x: -0.35580885, y: 1.7282498} + - {x: -0.3551316, y: -1.7632208} + - {x: -0.32951766, y: -1.8068172} + - {x: -0.2533272, y: -1.8848121} + - {x: 0.22865954, y: -1.8908459} + - {x: 0.31303078, y: -1.8335799} + - {x: 0.35513163, y: -1.7526319} + - {x: 0.3584769, y: 1.7621745} + - {x: 0.3315519, y: 1.8093777} + - {x: 0.2891422, y: 1.8532251} m_UseDelaunayMesh: 0 diff --git a/Forest/Assets/Art/LevelItem/Plank/VerticalSquareWithFour.prefab b/Forest/Assets/Art/LevelItem/Plank/VerticalSquareWithFour.prefab index 7424357..0fe50a6 100644 --- a/Forest/Assets/Art/LevelItem/Plank/VerticalSquareWithFour.prefab +++ b/Forest/Assets/Art/LevelItem/Plank/VerticalSquareWithFour.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 3574830487638685727} - component: {fileID: 1300969249358770615} - component: {fileID: 5115761745792231475} - - component: {fileID: 1368638558220567853} + - component: {fileID: 9211837097060399119} m_Layer: 6 m_Name: VerticalSquareWithFour m_TagString: Untagged @@ -113,7 +113,7 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!60 &1368638558220567853 +--- !u!60 &9211837097060399119 PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -149,7 +149,7 @@ PolygonCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.7894737, y: 3.4210527} + oldSize: {x: 0.71428573, y: 3.0952382} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -157,23 +157,22 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: 0.33530414, y: 1.6524582} - - {x: 0.28234613, y: 1.6882437} - - {x: 0.23286085, y: 1.7061721} - - {x: -0.23350438, y: 1.7037874} - - {x: -0.2974981, y: 1.6784343} - - {x: -0.36134687, y: 1.6105852} - - {x: -0.39184874, y: 1.5394765} - - {x: -0.39352843, y: -1.5481986} - - {x: -0.36752406, y: -1.6106143} - - {x: -0.3052952, y: -1.6754814} - - {x: -0.2653054, y: -1.6990464} - - {x: -0.22454207, y: -1.7082721} - - {x: 0.22523233, y: -1.7094073} - - {x: 0.31459844, y: -1.664779} - - {x: 0.36336544, y: -1.6080204} - - {x: 0.39473686, y: -1.5380324} - - {x: 0.39473686, y: 1.5444744} - - {x: 0.3845768, y: 1.5735148} - - {x: 0.37114763, y: 1.6000069} + - - {x: 0.35740295, y: 1.3866585} + - {x: 0.34163693, y: 1.4379827} + - {x: 0.2882842, y: 1.5071219} + - {x: 0.21804014, y: 1.5465115} + - {x: -0.21722487, y: 1.54682} + - {x: -0.26066327, y: 1.5260445} + - {x: -0.3030494, y: 1.4921297} + - {x: -0.3236811, y: 1.4650046} + - {x: -0.34203088, y: 1.4303862} + - {x: -0.35953987, y: 1.3853933} + - {x: -0.35434493, y: -1.4006459} + - {x: -0.31684908, y: -1.4783343} + - {x: -0.2734277, y: -1.5166869} + - {x: -0.21770254, y: -1.5490181} + - {x: 0.2162766, y: -1.5490181} + - {x: 0.29553407, y: -1.501695} + - {x: 0.33726126, y: -1.4563088} + - {x: 0.35854185, y: -1.4098198} m_UseDelaunayMesh: 0 diff --git a/Forest/Assets/Art/LevelItem/Plank/VerticalSquareWithThree.prefab b/Forest/Assets/Art/LevelItem/Plank/VerticalSquareWithThree.prefab index b2d23f7..d3119c2 100644 --- a/Forest/Assets/Art/LevelItem/Plank/VerticalSquareWithThree.prefab +++ b/Forest/Assets/Art/LevelItem/Plank/VerticalSquareWithThree.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 1247206262952642712} - component: {fileID: 1268579453475659201} - component: {fileID: 7128380988141886081} - - component: {fileID: 5162989274515386141} + - component: {fileID: 222340293314550649} m_Layer: 6 m_Name: VerticalSquareWithThree m_TagString: Untagged @@ -113,7 +113,7 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!60 &5162989274515386141 +--- !u!60 &222340293314550649 PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -149,7 +149,7 @@ PolygonCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.7894737, y: 2.5578947} + oldSize: {x: 0.71428573, y: 2.3142858} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -157,20 +157,20 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: 0.3228348, y: 1.238666} - - {x: 0.2631579, y: 1.2736843} - - {x: 0.2526316, y: 1.2789475} - - {x: -0.24944225, y: 1.273726} - - {x: -0.3397724, y: 1.2199646} - - {x: -0.38951537, y: 1.1304219} - - {x: -0.3882985, y: -1.1150787} - - {x: -0.360109, y: -1.1865975} - - {x: -0.32178602, y: -1.2309568} - - {x: -0.2574447, y: -1.2721434} - - {x: 0.2296258, y: -1.2768332} - - {x: 0.2836451, y: -1.2583519} - - {x: 0.34259757, y: -1.2187295} - - {x: 0.3947359, y: -1.1350144} - - {x: 0.39647734, y: 1.13556} - - {x: 0.35258994, y: 1.2159145} + - - {x: 0.33663058, y: 1.0701993} + - {x: 0.29125106, y: 1.1168132} + - {x: 0.2236053, y: 1.155779} + - {x: -0.21209258, y: 1.1544152} + - {x: -0.2645643, y: 1.1333106} + - {x: -0.31305665, y: 1.0898063} + - {x: -0.35577905, y: 0.9971363} + - {x: -0.35339585, y: -1.0256052} + - {x: -0.3218582, y: -1.0794693} + - {x: -0.27792662, y: -1.1200526} + - {x: -0.22107857, y: -1.1558938} + - {x: 0.22802594, y: -1.1521469} + - {x: 0.29891342, y: -1.1082245} + - {x: 0.3303671, y: -1.0817333} + - {x: 0.35339585, y: -1.036144} + - {x: 0.35714287, y: 1.0100809} m_UseDelaunayMesh: 0 diff --git a/Forest/Assets/Art/LevelItem/Plank/VerticalSquareWithTwo.prefab b/Forest/Assets/Art/LevelItem/Plank/VerticalSquareWithTwo.prefab index b0b9416..ecc0b18 100644 --- a/Forest/Assets/Art/LevelItem/Plank/VerticalSquareWithTwo.prefab +++ b/Forest/Assets/Art/LevelItem/Plank/VerticalSquareWithTwo.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 1502572474490150272} - component: {fileID: 6378253849236045833} - component: {fileID: 6772621719155050704} - - component: {fileID: 8228757953819686416} + - component: {fileID: 2528517662450164280} m_Layer: 6 m_Name: VerticalSquareWithTwo m_TagString: Untagged @@ -113,7 +113,7 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!60 &8228757953819686416 +--- !u!60 &2528517662450164280 PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -149,7 +149,7 @@ PolygonCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.7894737, y: 1.7263157} + oldSize: {x: 0.71428573, y: 1.5619048} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -157,22 +157,19 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: 0.39692274, y: 0.6819929} - - {x: 0.37048626, y: 0.7471053} - - {x: 0.30158108, y: 0.82461804} - - {x: 0.25153866, y: 0.85550725} - - {x: -0.22105265, y: 0.8631579} - - {x: -0.2777883, y: 0.841733} - - {x: -0.3344546, y: 0.80417025} - - {x: -0.39473686, y: 0.70704585} - - {x: -0.3936859, y: -0.70326245} - - {x: -0.35962233, y: -0.77429} - - {x: -0.3179335, y: -0.8200438} - - {x: -0.28210863, y: -0.8463428} - - {x: -0.24094966, y: -0.8633204} - - {x: 0.2315833, y: -0.86105293} - - {x: 0.3063184, y: -0.828423} - - {x: 0.33387384, y: -0.80514497} - - {x: 0.37052825, y: -0.7568444} - - {x: 0.39368433, y: -0.69579536} + - - {x: 0.22742754, y: 0.7750466} + - {x: -0.21555898, y: 0.779265} + - {x: -0.2842702, y: 0.74418736} + - {x: -0.33766025, y: 0.68036675} + - {x: -0.35798654, y: 0.63231885} + - {x: -0.35425082, y: -0.6307653} + - {x: -0.32264808, y: -0.7034327} + - {x: -0.2745699, y: -0.7474445} + - {x: -0.21852398, y: -0.7766143} + - {x: 0.22480658, y: -0.7780604} + - {x: 0.30587658, y: -0.72739387} + - {x: 0.35858887, y: -0.63365734} + - {x: 0.35630047, y: 0.61440116} + - {x: 0.33834434, y: 0.6797565} + - {x: 0.2783644, y: 0.74870604} m_UseDelaunayMesh: 0 diff --git a/Forest/Assets/Art/Texture/LevelItem/LR_Hole.png.meta b/Forest/Assets/Art/Texture/LevelItem/LR_Hole.png.meta index b23c7b0..81b7e47 100644 --- a/Forest/Assets/Art/Texture/LevelItem/LR_Hole.png.meta +++ b/Forest/Assets/Art/Texture/LevelItem/LR_Hole.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 190 + spritePixelsToUnits: 250 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Forest/Assets/Art/Texture/LevelItem/LR_Hole86.png.meta b/Forest/Assets/Art/Texture/LevelItem/LR_Hole86.png.meta index 2485ae7..61ac5f7 100644 --- a/Forest/Assets/Art/Texture/LevelItem/LR_Hole86.png.meta +++ b/Forest/Assets/Art/Texture/LevelItem/LR_Hole86.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 200 + spritePixelsToUnits: 255 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Forest/Assets/Art/Texture/LevelItem/LR_Thumbtack.png.meta b/Forest/Assets/Art/Texture/LevelItem/LR_Thumbtack.png.meta index 3031fbf..3c7ca06 100644 --- a/Forest/Assets/Art/Texture/LevelItem/LR_Thumbtack.png.meta +++ b/Forest/Assets/Art/Texture/LevelItem/LR_Thumbtack.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 200 + spritePixelsToUnits: 250 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_Circle.png.meta b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_Circle.png.meta index af3b7ac..adfd8a6 100644 --- a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_Circle.png.meta +++ b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_Circle.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 145 + spritePixelsToUnits: 170 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_HorizontalSquareWithFive.png.meta b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_HorizontalSquareWithFive.png.meta index e0dc592..1f967a4 100644 --- a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_HorizontalSquareWithFive.png.meta +++ b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_HorizontalSquareWithFive.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 210 + spritePixelsToUnits: 225 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_HorizontalSquareWithFour.png.meta b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_HorizontalSquareWithFour.png.meta index ed0859d..2f56610 100644 --- a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_HorizontalSquareWithFour.png.meta +++ b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_HorizontalSquareWithFour.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 210 + spritePixelsToUnits: 225 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_HorizontalSquareWithThree.png.meta b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_HorizontalSquareWithThree.png.meta index b50066e..a23bf32 100644 --- a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_HorizontalSquareWithThree.png.meta +++ b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_HorizontalSquareWithThree.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 210 + spritePixelsToUnits: 225 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_HorizontalSquareWithTwo.png.meta b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_HorizontalSquareWithTwo.png.meta index 1a323d7..6a83236 100644 --- a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_HorizontalSquareWithTwo.png.meta +++ b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_HorizontalSquareWithTwo.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 210 + spritePixelsToUnits: 225 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_InclinedSquareToLeft.png.meta b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_InclinedSquareToLeft.png.meta index 7ad50b7..4c0f3ad 100644 --- a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_InclinedSquareToLeft.png.meta +++ b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_InclinedSquareToLeft.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 180 + spritePixelsToUnits: 200 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_InclinedSquareToRight.png.meta b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_InclinedSquareToRight.png.meta index 12c8b35..159a8f8 100644 --- a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_InclinedSquareToRight.png.meta +++ b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_InclinedSquareToRight.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 180 + spritePixelsToUnits: 200 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_InclinedTriangle.png.meta b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_InclinedTriangle.png.meta index 129c0e4..95749d5 100644 --- a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_InclinedTriangle.png.meta +++ b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_InclinedTriangle.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 2 spritePivot: {x: 0.5, y: 1} - spritePixelsToUnits: 195 + spritePixelsToUnits: 210 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_MultiSquare.png.meta b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_MultiSquare.png.meta index 1b402f6..3d49c25 100644 --- a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_MultiSquare.png.meta +++ b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_MultiSquare.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 175 + spritePixelsToUnits: 190 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_RightTriangle.png.meta b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_RightTriangle.png.meta index be2a3a1..791c95b 100644 --- a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_RightTriangle.png.meta +++ b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_RightTriangle.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 6 spritePivot: {x: 0, y: 0} - spritePixelsToUnits: 180 + spritePixelsToUnits: 210 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_VerticalSquareWithFive.png.meta b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_VerticalSquareWithFive.png.meta index 6c206d6..81b99e2 100644 --- a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_VerticalSquareWithFive.png.meta +++ b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_VerticalSquareWithFive.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 190 + spritePixelsToUnits: 210 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_VerticalSquareWithFour.png.meta b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_VerticalSquareWithFour.png.meta index e488c68..803440b 100644 --- a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_VerticalSquareWithFour.png.meta +++ b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_VerticalSquareWithFour.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 190 + spritePixelsToUnits: 210 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_VerticalSquareWithThree.png.meta b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_VerticalSquareWithThree.png.meta index 49dfa39..f6ada28 100644 --- a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_VerticalSquareWithThree.png.meta +++ b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_VerticalSquareWithThree.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 190 + spritePixelsToUnits: 210 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_VerticalSquareWithTwo.png.meta b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_VerticalSquareWithTwo.png.meta index 324c4a5..6b548d0 100644 --- a/Forest/Assets/Art/Texture/LevelItem/Plank/LR_VerticalSquareWithTwo.png.meta +++ b/Forest/Assets/Art/Texture/LevelItem/Plank/LR_VerticalSquareWithTwo.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 190 + spritePixelsToUnits: 210 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Forest/Assets/Editor/Level/GeneratorScene.unity b/Forest/Assets/Editor/Level/GeneratorScene.unity index a387220..63b71de 100644 --- a/Forest/Assets/Editor/Level/GeneratorScene.unity +++ b/Forest/Assets/Editor/Level/GeneratorScene.unity @@ -414,9 +414,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0bd1f2a364b6ec34d99c5d9f9c57c744, type: 3} m_Name: m_EditorClassIdentifier: - rootCanvas: {fileID: 2119221077} root: {fileID: 2119221073} rootBg: {fileID: 1239306252} + rootGfx: {fileID: 0} + UICamera: {fileID: 0} --- !u!4 &579291509 Transform: m_ObjectHideFlags: 0 @@ -569,7 +570,7 @@ GameObject: m_Component: - component: {fileID: 953781201} m_Layer: 0 - m_Name: HoleRoot + m_Name: KongRoot m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Forest/Assets/Scripts/Framework/Constants/Constants.Level.cs b/Forest/Assets/Scripts/Framework/Constants/Constants.Level.cs index 29329c8..002d06c 100644 --- a/Forest/Assets/Scripts/Framework/Constants/Constants.Level.cs +++ b/Forest/Assets/Scripts/Framework/Constants/Constants.Level.cs @@ -69,7 +69,7 @@ namespace Framework.Constants public const float CheckRadius = 0.1f; //hole间距 - public const float Spacing = 0.47f; + public const float Spacing = 0.35f; //整体hole偏移距离 public const float Offset = 0f; @@ -78,10 +78,10 @@ namespace Framework.Constants public const float Radius = 0.225f; //倾斜三角形与顶点的间距 - public const float SpacingOfTriangle = 0.08f; + public const float SpacingOfTriangle = 0.03f; //正直角三角形与底边的距离 - public const float SpacingOfRightTriangle = 0.15f; + public const float SpacingOfRightTriangle = 0.09f; //木板的Hole和Hole的最大重合距离 public const float MaxDistance = 0.05f; diff --git a/Forest/Assets/Scripts/Gameplay/Level/Level.cs b/Forest/Assets/Scripts/Gameplay/Level/Level.cs index eb43d92..c8172b1 100644 --- a/Forest/Assets/Scripts/Gameplay/Level/Level.cs +++ b/Forest/Assets/Scripts/Gameplay/Level/Level.cs @@ -3,7 +3,6 @@ using PhxhSDK.Phxh; using Framework.BI; using Gameplay.Manager; using LC.Newtonsoft.Json; -using Framework.Constants; using Cysharp.Threading.Tasks; using Constants = Framework.Constants.Constants;