diff --git a/Forest/Assets/Art/UI/Prefab/UIPausePanel.prefab b/Forest/Assets/Art/UI/Prefab/UIPausePanel.prefab index 4b2f1c6..1124ade 100644 --- a/Forest/Assets/Art/UI/Prefab/UIPausePanel.prefab +++ b/Forest/Assets/Art/UI/Prefab/UIPausePanel.prefab @@ -504,7 +504,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 202} + m_AnchoredPosition: {x: 0, y: 367} m_SizeDelta: {x: 540, y: 182.23} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6518206792914461152 @@ -774,7 +774,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -498} + m_AnchoredPosition: {x: 0, y: -333} m_SizeDelta: {x: 540, y: 182.23} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &59700562780593630 @@ -895,7 +895,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -156} + m_AnchoredPosition: {x: 0, y: 9} m_SizeDelta: {x: 540, y: 182.23} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8765130877895363808 @@ -997,7 +997,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4358280617645775385 RectTransform: m_ObjectHideFlags: 0 diff --git a/Forest/Assets/Config/Level/level1.json b/Forest/Assets/Config/Level/level1.json index 619e9db..d2ef1e1 100644 --- a/Forest/Assets/Config/Level/level1.json +++ b/Forest/Assets/Config/Level/level1.json @@ -1,25 +1,29 @@ { - "columnCount": 5, - "rowCount": 5, + "columnCount": 4, + "rowCount": 6, "undoCount": 0, "addTimeCount": 0, "openHoleCount": 0, - "resetCount": 0, + "resetCount": 1, "holesIndex": [ + 1, 2, + 21, 22 ], "emptyHoleIndex": [ + 21, 22 ], "planksType": [ - 8 + 0 ], "squareType": [ - 4 + 0 ], "HolesOfPlanksIndex": [ [ + 1, 2 ] ] diff --git a/Forest/Assets/Config/Level/level1.json.meta b/Forest/Assets/Config/Level/level1.json.meta index eeff058..c0ab732 100644 --- a/Forest/Assets/Config/Level/level1.json.meta +++ b/Forest/Assets/Config/Level/level1.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: eb69d6de050ae9a4098bd11b77e70326 +guid: f8c7c4e84284a4d1e90a10268a94b6ed TextScriptImporter: externalObjects: {} userData: diff --git a/Forest/Assets/Config/Level/level10.json b/Forest/Assets/Config/Level/level10.json index dd81764..3ace19c 100644 --- a/Forest/Assets/Config/Level/level10.json +++ b/Forest/Assets/Config/Level/level10.json @@ -1,148 +1,109 @@ { "columnCount": 5, - "rowCount": 7, + "rowCount": 5, "undoCount": 0, - "addTimeCount": 1, + "addTimeCount": 0, "openHoleCount": 0, - "resetCount": 0, + "resetCount": 1, "holesIndex": [ 0, - 1, 2, 3, 4, + 5, + 6, + 8, + 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, - 19, 20, 21, 22, 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 32, - 33, - 34 + 24 ], "emptyHoleIndex": [ - 0, - 1, 2, + 3, 4, - 3 + 9, + 14 ], "planksType": [ 0, 0, 0, 0, - 0, - 0, 1, 1, 1, 1, - 1 + 8 ], "squareType": [ - 3, - 3, - 3, - 3, + 0, 1, + 2, + 3, + 0, 1, + 2, 3, - 3, - 3, - 3, - 3 + 4 ], "HolesOfPlanksIndex": [ [ - 30, - 31, - 32, - 33, - 34 + 5, + 6 + ], + [ + 10, + 11, + 12 ], [ 15, 16, 17, - 18, - 19 - ], - [ - 10, - 11, - 12, - 13, - 14 - ], - [ - 25, - 26, - 27, - 28, - 29 + 18 ], [ + 20, + 21, 22, 23, 24 ], [ - 20, - 21, - 22 + 18, + 23 ], [ 12, 17, - 22, - 27, - 32 - ], - [ - 13, - 18, - 23, - 28, - 33 - ], - [ - 14, - 19, - 24, - 29, - 34 + 22 ], [ + 6, 11, 16, - 21, - 26, - 31 + 21 ], [ + 0, + 5, 10, 15, - 20, - 25, - 30 + 20 + ], + [ + 8 ] ] } \ No newline at end of file diff --git a/Forest/Assets/Config/Level/level10.json.meta b/Forest/Assets/Config/Level/level10.json.meta index 5609ccd..cece72c 100644 --- a/Forest/Assets/Config/Level/level10.json.meta +++ b/Forest/Assets/Config/Level/level10.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4f522bcbde411ad4aa52002dbceedb85 +guid: ca958fed7af097e4e87cff0442bc8d58 TextScriptImporter: externalObjects: {} userData: diff --git a/Forest/Assets/Config/Level/level100.json b/Forest/Assets/Config/Level/level100.json index c3f8e8e..ad67d95 100644 --- a/Forest/Assets/Config/Level/level100.json +++ b/Forest/Assets/Config/Level/level100.json @@ -1,9 +1,9 @@ { "columnCount": 4, "rowCount": 6, - "undoCount": 2, + "undoCount": 1, "addTimeCount": 0, - "openHoleCount": 1, + "openHoleCount": 0, "resetCount": 1, "holesIndex": [ 0, diff --git a/Forest/Assets/Config/Level/level101.json b/Forest/Assets/Config/Level/level101.json index 4772688..da5d2dd 100644 --- a/Forest/Assets/Config/Level/level101.json +++ b/Forest/Assets/Config/Level/level101.json @@ -1,7 +1,7 @@ { "columnCount": 4, "rowCount": 6, - "undoCount": 1, + "undoCount": 0, "addTimeCount": 0, "openHoleCount": 1, "resetCount": 1, diff --git a/Forest/Assets/Config/Level/level105.json b/Forest/Assets/Config/Level/level105.json index 4471656..d4e889b 100644 --- a/Forest/Assets/Config/Level/level105.json +++ b/Forest/Assets/Config/Level/level105.json @@ -1,8 +1,8 @@ { "columnCount": 3, "rowCount": 6, - "undoCount": 1, - "addTimeCount": 1, + "undoCount": 0, + "addTimeCount": 0, "openHoleCount": 1, "resetCount": 1, "holesIndex": [ diff --git a/Forest/Assets/Config/Level/level122.json b/Forest/Assets/Config/Level/level122.json index d6d98ba..3a86939 100644 --- a/Forest/Assets/Config/Level/level122.json +++ b/Forest/Assets/Config/Level/level122.json @@ -1,7 +1,7 @@ { "columnCount": 3, "rowCount": 7, - "undoCount": 1, + "undoCount": 0, "addTimeCount": 0, "openHoleCount": 0, "resetCount": 1, diff --git a/Forest/Assets/Config/Level/level124.json b/Forest/Assets/Config/Level/level124.json index 4be1d70..90f5113 100644 --- a/Forest/Assets/Config/Level/level124.json +++ b/Forest/Assets/Config/Level/level124.json @@ -1,7 +1,7 @@ { "columnCount": 4, "rowCount": 5, - "undoCount": 1, + "undoCount": 0, "addTimeCount": 0, "openHoleCount": 0, "resetCount": 1, diff --git a/Forest/Assets/Config/Level/level125.json b/Forest/Assets/Config/Level/level125.json index 6264d8f..b86c6db 100644 --- a/Forest/Assets/Config/Level/level125.json +++ b/Forest/Assets/Config/Level/level125.json @@ -1,7 +1,7 @@ { "columnCount": 4, "rowCount": 6, - "undoCount": 1, + "undoCount": 0, "addTimeCount": 0, "openHoleCount": 0, "resetCount": 1, diff --git a/Forest/Assets/Config/Level/level2.json b/Forest/Assets/Config/Level/level2.json index 27973d7..e566724 100644 --- a/Forest/Assets/Config/Level/level2.json +++ b/Forest/Assets/Config/Level/level2.json @@ -1,45 +1,64 @@ { - "columnCount": 4, - "rowCount": 5, - "undoCount": 1, + "columnCount": 5, + "rowCount": 6, + "undoCount": 0, "addTimeCount": 0, "openHoleCount": 0, - "resetCount": 0, + "resetCount": 1, "holesIndex": [ 0, 1, 2, 3, + 4, 5, - 6, + 7, 9, - 10, + 11, 12, 13, - 14, 15, 16, 17, 18, - 19 + 19, + 21, + 22, + 23, + 25, + 27, + 29 ], "emptyHoleIndex": [ - 0, - 1, + 4, + 3, 2, - 3 + 1, + 0 ], "planksType": [ + 0, + 0, + 0, + 1, 1, 1, - 2, - 2, 3, - 4 + 3, + 4, + 4, + 7, + 10 ], "squareType": [ - 2, - 2, + 3, + 3, + 3, + 3, + 3, + 3, + 4, + 4, 4, 4, 4, @@ -47,36 +66,66 @@ ], "HolesOfPlanksIndex": [ [ - 5, - 9, - 13, - 17 + 25, + 27, + 29 ], [ - 6, - 10, - 14, - 18 - ], - [ - 12, - 13, - 16, - 17 - ], - [ - 14, 15, + 16, + 17, 18, 19 ], [ - 9, - 14 + 5, + 7, + 9 ], [ - 10, + 5, + 15, + 25 + ], + [ + 9, + 19, + 29 + ], + [ + 7, + 12, + 17, + 22, + 27 + ], + [ + 23, + 29 + ], + [ + 5, + 11 + ], + [ + 21, + 25 + ], + [ + 9, 13 + ], + [ + 7, + 11, + 12, + 13 + ], + [ + 27, + 23, + 22, + 21 ] ] -} \ No newline at end of file +} diff --git a/Forest/Assets/Config/Level/level2.json.meta b/Forest/Assets/Config/Level/level2.json.meta index 869b7b0..0328468 100644 --- a/Forest/Assets/Config/Level/level2.json.meta +++ b/Forest/Assets/Config/Level/level2.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4943ae1833d88434bb11c279322d64fc +guid: 3f322f6ed54628e4eaf89a361a6595c4 TextScriptImporter: externalObjects: {} userData: diff --git a/Forest/Assets/Config/Level/level21.json b/Forest/Assets/Config/Level/level21.json index fbb2a30..bf6233f 100644 --- a/Forest/Assets/Config/Level/level21.json +++ b/Forest/Assets/Config/Level/level21.json @@ -2,7 +2,7 @@ "columnCount": 4, "rowCount": 5, "undoCount": 0, - "addTimeCount": 1, + "addTimeCount": 0, "openHoleCount": 2, "resetCount": 1, "holesIndex": [ diff --git a/Forest/Assets/Config/Level/level22.json b/Forest/Assets/Config/Level/level22.json index 7c57c3b..94ffaa5 100644 --- a/Forest/Assets/Config/Level/level22.json +++ b/Forest/Assets/Config/Level/level22.json @@ -1,8 +1,8 @@ { "columnCount": 4, "rowCount": 6, - "undoCount": 1, - "addTimeCount": 1, + "undoCount": 0, + "addTimeCount": 0, "openHoleCount": 1, "resetCount": 1, "holesIndex": [ diff --git a/Forest/Assets/Config/Level/level23.json b/Forest/Assets/Config/Level/level23.json index 310e80c..43272d4 100644 --- a/Forest/Assets/Config/Level/level23.json +++ b/Forest/Assets/Config/Level/level23.json @@ -1,96 +1,60 @@ { "columnCount": 5, - "rowCount": 6, - "undoCount": 2, + "rowCount": 5, + "undoCount": 0, "addTimeCount": 0, - "openHoleCount": 1, + "openHoleCount": 0, "resetCount": 1, "holesIndex": [ - 2, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 16, - 17, - 18, - 25, - 26, - 27, - 28, - 29 - ], - "emptyHoleIndex": [ - 27, - 25, - 29 - ], - "planksType": [ 0, - 1, + 2, 3, 4, - 8, - 8, - 8, - 8, - 8, - 8 + 5, + 7, + 10, + 12, + 13, + 15, + 17, + 20, + 22, + 23, + 24 + ], + "emptyHoleIndex": [ + 0, + 10, + 5, + 15, + 20 + ], + "planksType": [ + 1, + 1, + 1 ], "squareType": [ - 1, - 1, - 4, - 4, - 4, - 4, - 4, - 4, - 4, - 4 + 3, + 3, + 3 ], "HolesOfPlanksIndex": [ - [ - 6, - 7, - 8 - ], [ 2, 7, - 12 + 12, + 17, + 22 ], [ - 10, - 16 + 3, + 13, + 23 ], [ - 14, - 18 - ], - [ - 5 - ], - [ - 2 - ], - [ - 9 - ], - [ - 17 - ], - [ - 13 - ], - [ - 11 + 4, + 24 ] ] } \ No newline at end of file diff --git a/Forest/Assets/Config/Level/level23.json.meta b/Forest/Assets/Config/Level/level23.json.meta index 9cbb379..7fc8e41 100644 --- a/Forest/Assets/Config/Level/level23.json.meta +++ b/Forest/Assets/Config/Level/level23.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a065e61813470f84ba92f7a384fb40a7 +guid: 19b79b47c0374064a8bc1a3e6e447ceb TextScriptImporter: externalObjects: {} userData: diff --git a/Forest/Assets/Config/Level/level3.json b/Forest/Assets/Config/Level/level3.json index 961f8ae..2db22ac 100644 --- a/Forest/Assets/Config/Level/level3.json +++ b/Forest/Assets/Config/Level/level3.json @@ -4,22 +4,18 @@ "undoCount": 0, "addTimeCount": 0, "openHoleCount": 1, - "resetCount": 0, + "resetCount": 1, "holesIndex": [ 0, - 1, - 2, - 3, 4, - 6, - 7, - 8, 11, 12, 13, + 15, 16, 17, 18, + 19, 20, 21, 22, @@ -27,26 +23,22 @@ 24 ], "emptyHoleIndex": [ - 13, - 7, - 11, - 17 + 4, + 0, + 24, + 20 ], "planksType": [ - 0, - 0, - 0, - 0, + 3, 3, 4, 4, - 3 + 8, + 10 ], "squareType": [ - 2, - 2, - 2, - 2, + 4, + 4, 4, 4, 4, @@ -54,44 +46,29 @@ ], "HolesOfPlanksIndex": [ [ - 21, - 22, - 23, - 24 + 15, + 21 ], [ - 1, - 2, - 3, - 4 + 16, + 22 ], [ - 20, - 21, - 22, + 19, 23 ], [ - 0, - 1, - 2, - 3 + 18, + 22 ], [ - 6, - 12 - ], - [ - 8, 12 ], [ + 17, + 13, 12, - 16 - ], - [ - 12, - 18 + 11 ] ] } \ No newline at end of file diff --git a/Forest/Assets/Config/Level/level3.json.meta b/Forest/Assets/Config/Level/level3.json.meta index f9f201d..d6b7f2f 100644 --- a/Forest/Assets/Config/Level/level3.json.meta +++ b/Forest/Assets/Config/Level/level3.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a409a57efea84b2409b03be05b088e27 +guid: 6d3331a9f64d43043943d23f606351c4 TextScriptImporter: externalObjects: {} userData: diff --git a/Forest/Assets/Config/Level/level35.json b/Forest/Assets/Config/Level/level35.json index 325e188..dd81764 100644 --- a/Forest/Assets/Config/Level/level35.json +++ b/Forest/Assets/Config/Level/level35.json @@ -1,109 +1,148 @@ { "columnCount": 5, - "rowCount": 5, - "undoCount": 1, + "rowCount": 7, + "undoCount": 0, "addTimeCount": 1, "openHoleCount": 0, - "resetCount": 1, + "resetCount": 0, "holesIndex": [ 0, + 1, 2, 3, 4, - 5, - 6, - 8, - 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, + 19, 20, 21, 22, 23, - 24 + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34 ], "emptyHoleIndex": [ + 0, + 1, 2, - 3, 4, - 9, - 14 + 3 ], "planksType": [ 0, 0, 0, 0, + 0, + 0, 1, 1, 1, 1, - 8 + 1 ], "squareType": [ - 0, - 1, - 2, 3, - 0, - 1, - 2, 3, - 4 + 3, + 3, + 1, + 1, + 3, + 3, + 3, + 3, + 3 ], "HolesOfPlanksIndex": [ [ - 5, - 6 - ], - [ - 10, - 11, - 12 + 30, + 31, + 32, + 33, + 34 ], [ 15, 16, 17, - 18 + 18, + 19 + ], + [ + 10, + 11, + 12, + 13, + 14 + ], + [ + 25, + 26, + 27, + 28, + 29 ], [ - 20, - 21, 22, 23, 24 ], [ - 18, - 23 + 20, + 21, + 22 ], [ 12, 17, - 22 + 22, + 27, + 32 + ], + [ + 13, + 18, + 23, + 28, + 33 + ], + [ + 14, + 19, + 24, + 29, + 34 ], [ - 6, 11, 16, - 21 + 21, + 26, + 31 ], [ - 0, - 5, 10, 15, - 20 - ], - [ - 8 + 20, + 25, + 30 ] ] } \ No newline at end of file diff --git a/Forest/Assets/Config/Level/level35.json.meta b/Forest/Assets/Config/Level/level35.json.meta index cece72c..5609ccd 100644 --- a/Forest/Assets/Config/Level/level35.json.meta +++ b/Forest/Assets/Config/Level/level35.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ca958fed7af097e4e87cff0442bc8d58 +guid: 4f522bcbde411ad4aa52002dbceedb85 TextScriptImporter: externalObjects: {} userData: diff --git a/Forest/Assets/Config/Level/level4.json b/Forest/Assets/Config/Level/level4.json index dda4e92..8a7a41b 100644 --- a/Forest/Assets/Config/Level/level4.json +++ b/Forest/Assets/Config/Level/level4.json @@ -1,14 +1,17 @@ { - "columnCount": 3, - "rowCount": 5, + "columnCount": 4, + "rowCount": 6, "undoCount": 0, "addTimeCount": 0, - "openHoleCount": 1, + "openHoleCount": 0, "resetCount": 1, "holesIndex": [ 0, 1, 2, + 3, + 4, + 5, 6, 7, 8, @@ -17,59 +20,91 @@ 11, 12, 13, - 14 + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23 ], "emptyHoleIndex": [ - 0, - 1, - 2 + 4, + 5, + 6, + 7 ], "planksType": [ 0, - 0, - 0, - 1, - 1, - 1 + 5, + 5, + 6, + 6, + 12, + 12, + 13, + 13 ], "squareType": [ - 1, - 1, - 1, - 1, - 1, - 1 + 2, + 4, + 4, + 4, + 4, + 4, + 4, + 4, + 4 ], "HolesOfPlanksIndex": [ [ - 6, - 7, - 8 + 0, + 1, + 2, + 3 ], [ - 9, - 10, + 23, + 22, + 19 + ], + [ + 15, + 14, 11 ], + [ + 20, + 21, + 16 + ], [ 12, 13, - 14 + 8 + ], + [ + 11, + 10, + 15 + ], + [ + 19, + 18, + 23 ], [ 8, - 11, - 14 - ], - [ - 7, - 10, - 13 - ], - [ - 6, 9, 12 + ], + [ + 16, + 17, + 20 ] ] } \ No newline at end of file diff --git a/Forest/Assets/Config/Level/level4.json.meta b/Forest/Assets/Config/Level/level4.json.meta index c3da359..6cfce1f 100644 --- a/Forest/Assets/Config/Level/level4.json.meta +++ b/Forest/Assets/Config/Level/level4.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9535a1e17ffcccb43929411bbd1c80bd +guid: 16fb8458ffb409043a9960d8934be672 TextScriptImporter: externalObjects: {} userData: diff --git a/Forest/Assets/Config/Level/level42.json b/Forest/Assets/Config/Level/level42.json index 800ebcd..491b767 100644 --- a/Forest/Assets/Config/Level/level42.json +++ b/Forest/Assets/Config/Level/level42.json @@ -1,7 +1,7 @@ { "columnCount": 4, "rowCount": 5, - "undoCount": 1, + "undoCount": 0, "addTimeCount": 0, "openHoleCount": 1, "resetCount": 1, diff --git a/Forest/Assets/Config/Level/level44.json b/Forest/Assets/Config/Level/level44.json index c7fdcd1..0f7fbdc 100644 --- a/Forest/Assets/Config/Level/level44.json +++ b/Forest/Assets/Config/Level/level44.json @@ -3,7 +3,7 @@ "rowCount": 4, "undoCount": 0, "addTimeCount": 0, - "openHoleCount": 2, + "openHoleCount": 1, "resetCount": 1, "holesIndex": [ 0, diff --git a/Forest/Assets/Config/Level/level45.json b/Forest/Assets/Config/Level/level45.json index 5e3bc0c..0a08546 100644 --- a/Forest/Assets/Config/Level/level45.json +++ b/Forest/Assets/Config/Level/level45.json @@ -1,9 +1,9 @@ { "columnCount": 5, "rowCount": 6, - "undoCount": 1, - "addTimeCount": 1, - "openHoleCount": 1, + "undoCount": 0, + "addTimeCount": 0, + "openHoleCount": 0, "resetCount": 1, "holesIndex": [ 0, diff --git a/Forest/Assets/Config/Level/level46.json b/Forest/Assets/Config/Level/level46.json index 2db22ac..961f8ae 100644 --- a/Forest/Assets/Config/Level/level46.json +++ b/Forest/Assets/Config/Level/level46.json @@ -4,18 +4,22 @@ "undoCount": 0, "addTimeCount": 0, "openHoleCount": 1, - "resetCount": 1, + "resetCount": 0, "holesIndex": [ 0, + 1, + 2, + 3, 4, + 6, + 7, + 8, 11, 12, 13, - 15, 16, 17, 18, - 19, 20, 21, 22, @@ -23,22 +27,26 @@ 24 ], "emptyHoleIndex": [ - 4, - 0, - 24, - 20 + 13, + 7, + 11, + 17 ], "planksType": [ - 3, + 0, + 0, + 0, + 0, 3, 4, 4, - 8, - 10 + 3 ], "squareType": [ - 4, - 4, + 2, + 2, + 2, + 2, 4, 4, 4, @@ -46,29 +54,44 @@ ], "HolesOfPlanksIndex": [ [ - 15, - 21 + 21, + 22, + 23, + 24 ], [ - 16, - 22 + 1, + 2, + 3, + 4 ], [ - 19, + 20, + 21, + 22, 23 ], [ - 18, - 22 + 0, + 1, + 2, + 3 ], [ + 6, + 12 + ], + [ + 8, 12 ], [ - 17, - 13, 12, - 11 + 16 + ], + [ + 12, + 18 ] ] } \ No newline at end of file diff --git a/Forest/Assets/Config/Level/level46.json.meta b/Forest/Assets/Config/Level/level46.json.meta index d6b7f2f..f9f201d 100644 --- a/Forest/Assets/Config/Level/level46.json.meta +++ b/Forest/Assets/Config/Level/level46.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6d3331a9f64d43043943d23f606351c4 +guid: a409a57efea84b2409b03be05b088e27 TextScriptImporter: externalObjects: {} userData: diff --git a/Forest/Assets/Config/Level/level47.json b/Forest/Assets/Config/Level/level47.json index 0d77965..514593b 100644 --- a/Forest/Assets/Config/Level/level47.json +++ b/Forest/Assets/Config/Level/level47.json @@ -1,7 +1,7 @@ { "columnCount": 4, "rowCount": 6, - "undoCount": 2, + "undoCount": 0, "addTimeCount": 0, "openHoleCount": 0, "resetCount": 1, diff --git a/Forest/Assets/Config/Level/level48.json b/Forest/Assets/Config/Level/level48.json index d9736fa..4721536 100644 --- a/Forest/Assets/Config/Level/level48.json +++ b/Forest/Assets/Config/Level/level48.json @@ -1,8 +1,8 @@ { "columnCount": 4, "rowCount": 6, - "undoCount": 1, - "addTimeCount": 1, + "undoCount": 0, + "addTimeCount": 0, "openHoleCount": 1, "resetCount": 1, "holesIndex": [ diff --git a/Forest/Assets/Config/Level/level49.json b/Forest/Assets/Config/Level/level49.json index 28d5ec1..d8dcf81 100644 --- a/Forest/Assets/Config/Level/level49.json +++ b/Forest/Assets/Config/Level/level49.json @@ -1,9 +1,9 @@ { "columnCount": 4, "rowCount": 5, - "undoCount": 1, - "addTimeCount": 1, - "openHoleCount": 1, + "undoCount": 0, + "addTimeCount": 0, + "openHoleCount": 0, "resetCount": 1, "holesIndex": [ 0, diff --git a/Forest/Assets/Config/Level/level5.json b/Forest/Assets/Config/Level/level5.json index 98f88f1..3f3aebf 100644 --- a/Forest/Assets/Config/Level/level5.json +++ b/Forest/Assets/Config/Level/level5.json @@ -1,42 +1,51 @@ { "columnCount": 4, - "rowCount": 5, - "undoCount": 1, + "rowCount": 6, + "undoCount": 0, "addTimeCount": 0, "openHoleCount": 1, - "resetCount": 0, + "resetCount": 1, "holesIndex": [ 0, + 1, + 2, 3, + 4, 5, 6, + 7, + 8, 9, 10, + 11, 12, 13, 14, 15, - 16, 17, - 18, - 19 + 20, + 22 ], "emptyHoleIndex": [ - 16, + 20, 17, - 18, + 22, 19 ], "planksType": [ - 0, - 2, 3, 4, 4, - 3 + 3, + 5, + 6, + 12, + 13 ], "squareType": [ - 2, + 4, + 4, + 4, 4, 4, 4, @@ -45,32 +54,40 @@ ], "HolesOfPlanksIndex": [ [ - 12, - 13, - 14, - 15 - ], - [ - 5, - 6, - 9, - 10 - ], - [ - 0, - 5 - ], - [ - 3, + 1, 6 ], [ - 9, - 12 + 2, + 5 ], [ 10, - 15 + 13 + ], + [ + 9, + 14 + ], + [ + 15, + 14, + 11 + ], + [ + 12, + 13, + 8 + ], + [ + 3, + 2, + 7 + ], + [ + 0, + 1, + 4 ] ] } \ No newline at end of file diff --git a/Forest/Assets/Config/Level/level5.json.meta b/Forest/Assets/Config/Level/level5.json.meta index 8b172df..b95f16f 100644 --- a/Forest/Assets/Config/Level/level5.json.meta +++ b/Forest/Assets/Config/Level/level5.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c9cbbaa6be89170478e4f860c663a0df +guid: 740964d1190b3b141be48fca9c8024a6 TextScriptImporter: externalObjects: {} userData: diff --git a/Forest/Assets/Config/Level/level58.json b/Forest/Assets/Config/Level/level58.json index 71a1ead..b45e480 100644 --- a/Forest/Assets/Config/Level/level58.json +++ b/Forest/Assets/Config/Level/level58.json @@ -1,76 +1,108 @@ { - "columnCount": 4, + "columnCount": 5, "rowCount": 6, "undoCount": 0, "addTimeCount": 0, - "openHoleCount": 2, + "openHoleCount": 0, "resetCount": 1, "holesIndex": [ + 0, + 1, + 2, + 3, 4, 5, - 6, 7, 8, 9, 10, - 11, 12, - 13, 14, 15, + 17, + 19, 20, 21, 22, - 23 + 24, + 25, + 26, + 27, + 28, + 29 ], "emptyHoleIndex": [ + 7, + 2, 22, - 23, - 20, - 21 + 27 ], "planksType": [ 0, 0, + 1, + 1, + 1, + 2, 2, 5, - 6 + 13 ], "squareType": [ - 2, - 2, + 3, + 3, + 0, + 0, + 0, + 4, 4, 4, 4 ], "HolesOfPlanksIndex": [ [ - 8, - 9, - 10, - 11 + 15, + 17, + 19 ], [ + 10, 12, - 13, + 14 + ], + [ 14, + 19 + ], + [ + 10, 15 ], [ - 5, - 6, - 9, - 10 - ], - [ - 11, - 10, - 7 + 12, + 17 ], [ + 3, + 4, 8, - 9, - 4 + 9 + ], + [ + 20, + 21, + 25, + 26 + ], + [ + 29, + 28, + 24 + ], + [ + 0, + 1, + 5 ] ] } \ No newline at end of file diff --git a/Forest/Assets/Config/Level/level58.json.meta b/Forest/Assets/Config/Level/level58.json.meta index 5a78b0c..79a7214 100644 --- a/Forest/Assets/Config/Level/level58.json.meta +++ b/Forest/Assets/Config/Level/level58.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 94eb787d42e063c4b8a2d8f317ed7161 +guid: 5be45d7f723374019bb166233c65e79d TextScriptImporter: externalObjects: {} userData: diff --git a/Forest/Assets/Config/Level/level6.json b/Forest/Assets/Config/Level/level6.json index 5954dcf..0a64a0f 100644 --- a/Forest/Assets/Config/Level/level6.json +++ b/Forest/Assets/Config/Level/level6.json @@ -1,92 +1,60 @@ { "columnCount": 5, "rowCount": 5, - "undoCount": 0, - "addTimeCount": 0, - "openHoleCount": 0, + "undoCount": 1, + "addTimeCount": 1, + "openHoleCount": 1, "resetCount": 1, "holesIndex": [ 0, - 2, 4, - 6, + 5, 7, - 8, + 9, + 10, 11, 12, 13, - 15, - 16, - 18, - 19, + 14, 20, 21, + 22, 23, 24 ], "emptyHoleIndex": [ - 24, - 23, + 20, 21, - 20 + 22, + 23, + 24 ], "planksType": [ - 1, - 1, - 3, - 4, - 6, - 5, - 7, - 8 + 0, + 0, + 0 ], "squareType": [ - 1, - 1, - 4, - 4, - 4, - 4, - 4, - 4 + 3, + 3, + 3 ], "HolesOfPlanksIndex": [ - [ - 6, - 11, - 16 - ], - [ - 8, - 13, - 18 - ], [ 0, - 6 + 4 ], [ - 4, - 8 + 10, + 11, + 12, + 13, + 14 ], [ - 18, - 19, - 13 - ], - [ - 16, - 15, - 11 - ], - [ - 2, - 6, + 5, 7, - 8 - ], - [ - 12 + 9 ] ] } \ No newline at end of file diff --git a/Forest/Assets/Config/Level/level6.json.meta b/Forest/Assets/Config/Level/level6.json.meta index 61d9e34..fa8fedc 100644 --- a/Forest/Assets/Config/Level/level6.json.meta +++ b/Forest/Assets/Config/Level/level6.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a9c0b4a3ab4804840bb2cf02c9405102 +guid: 2742d7e69c170e846b27ed73a75f3f4d TextScriptImporter: externalObjects: {} userData: diff --git a/Forest/Assets/Config/Level/level7.json b/Forest/Assets/Config/Level/level7.json index 9dd4344..19617e1 100644 --- a/Forest/Assets/Config/Level/level7.json +++ b/Forest/Assets/Config/Level/level7.json @@ -1,49 +1,59 @@ { - "columnCount": 4, + "columnCount": 5, "rowCount": 5, "undoCount": 0, "addTimeCount": 0, "openHoleCount": 0, - "resetCount": 1, + "resetCount": 0, "holesIndex": [ - 0, 1, 2, 3, - 4, 5, 6, 7, + 8, 9, 10, - 12, + 11, 13, 14, - 15, + 16, 17, - 18 + 18, + 20, + 21, + 23, + 24 ], "emptyHoleIndex": [ - 0, - 1, - 2, - 3 + 20, + 21, + 23, + 24, + 17 ], "planksType": [ 0, - 0, - 0, - 0, + 1, + 1, + 3, + 3, + 3, 3, 4, 4, - 3 + 4, + 4 ], "squareType": [ + 3, 2, 2, - 0, - 0, + 4, + 4, + 4, + 4, 4, 4, 4, @@ -51,40 +61,55 @@ ], "HolesOfPlanksIndex": [ [ - 12, - 13, - 14, - 15 - ], - [ - 4, 5, 6, - 7 - ], - [ - 17, - 18 - ], - [ - 9, - 10 - ], - [ - 13, - 18 - ], - [ - 14, - 17 - ], - [ - 6, + 7, + 8, 9 ], [ - 5, + 3, + 8, + 13, + 18 + ], + [ + 1, + 6, + 11, + 16 + ], + [ + 10, + 16 + ], + [ + 7, + 13 + ], + [ + 8, + 14 + ], + [ + 2, + 8 + ], + [ + 14, + 18 + ], + [ + 7, + 11 + ], + [ + 6, 10 + ], + [ + 2, + 6 ] ] } \ No newline at end of file diff --git a/Forest/Assets/Config/Level/level7.json.meta b/Forest/Assets/Config/Level/level7.json.meta index 1188f7d..af199cd 100644 --- a/Forest/Assets/Config/Level/level7.json.meta +++ b/Forest/Assets/Config/Level/level7.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fc2fc0e8880b4c84a8805b8fb82aee31 +guid: c4c8b0386a8acba478ff1e54728cf396 TextScriptImporter: externalObjects: {} userData: diff --git a/Forest/Assets/Config/Level/level70.json b/Forest/Assets/Config/Level/level70.json index 032a665..dda4e92 100644 --- a/Forest/Assets/Config/Level/level70.json +++ b/Forest/Assets/Config/Level/level70.json @@ -1,17 +1,14 @@ { - "columnCount": 4, - "rowCount": 6, - "undoCount": 1, + "columnCount": 3, + "rowCount": 5, + "undoCount": 0, "addTimeCount": 0, - "openHoleCount": 0, + "openHoleCount": 1, "resetCount": 1, "holesIndex": [ 0, 1, 2, - 3, - 4, - 5, 6, 7, 8, @@ -20,91 +17,59 @@ 11, 12, 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23 + 14 ], "emptyHoleIndex": [ - 4, - 5, - 6, - 7 + 0, + 1, + 2 ], "planksType": [ 0, - 5, - 5, - 6, - 6, - 12, - 12, - 13, - 13 + 0, + 0, + 1, + 1, + 1 ], "squareType": [ - 2, - 4, - 4, - 4, - 4, - 4, - 4, - 4, - 4 + 1, + 1, + 1, + 1, + 1, + 1 ], "HolesOfPlanksIndex": [ [ - 0, - 1, - 2, - 3 + 6, + 7, + 8 ], [ - 23, - 22, - 19 - ], - [ - 15, - 14, + 9, + 10, 11 ], - [ - 20, - 21, - 16 - ], [ 12, 13, - 8 - ], - [ - 11, - 10, - 15 - ], - [ - 19, - 18, - 23 + 14 ], [ 8, - 9, - 12 + 11, + 14 ], [ - 16, - 17, - 20 + 7, + 10, + 13 + ], + [ + 6, + 9, + 12 ] ] } \ No newline at end of file diff --git a/Forest/Assets/Config/Level/level70.json.meta b/Forest/Assets/Config/Level/level70.json.meta index 6cfce1f..c3da359 100644 --- a/Forest/Assets/Config/Level/level70.json.meta +++ b/Forest/Assets/Config/Level/level70.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 16fb8458ffb409043a9960d8934be672 +guid: 9535a1e17ffcccb43929411bbd1c80bd TextScriptImporter: externalObjects: {} userData: diff --git a/Forest/Assets/Config/Level/level71.json b/Forest/Assets/Config/Level/level71.json index 29993f3..e75180d 100644 --- a/Forest/Assets/Config/Level/level71.json +++ b/Forest/Assets/Config/Level/level71.json @@ -1,7 +1,7 @@ { "columnCount": 5, "rowCount": 7, - "undoCount": 2, + "undoCount": 0, "addTimeCount": 0, "openHoleCount": 0, "resetCount": 1, diff --git a/Forest/Assets/Config/Level/level72.json b/Forest/Assets/Config/Level/level72.json index 3f3aebf..98f88f1 100644 --- a/Forest/Assets/Config/Level/level72.json +++ b/Forest/Assets/Config/Level/level72.json @@ -1,51 +1,42 @@ { "columnCount": 4, - "rowCount": 6, - "undoCount": 0, + "rowCount": 5, + "undoCount": 1, "addTimeCount": 0, "openHoleCount": 1, - "resetCount": 1, + "resetCount": 0, "holesIndex": [ 0, - 1, - 2, 3, - 4, 5, 6, - 7, - 8, 9, 10, - 11, 12, 13, 14, 15, + 16, 17, - 20, - 22 + 18, + 19 ], "emptyHoleIndex": [ - 20, + 16, 17, - 22, + 18, 19 ], "planksType": [ + 0, + 2, 3, 4, 4, - 3, - 5, - 6, - 12, - 13 + 3 ], "squareType": [ - 4, - 4, - 4, + 2, 4, 4, 4, @@ -53,41 +44,33 @@ 4 ], "HolesOfPlanksIndex": [ - [ - 1, - 6 - ], - [ - 2, - 5 - ], - [ - 10, - 13 - ], - [ - 9, - 14 - ], - [ - 15, - 14, - 11 - ], [ 12, 13, - 8 + 14, + 15 ], [ - 3, - 2, - 7 + 5, + 6, + 9, + 10 ], [ 0, - 1, - 4 + 5 + ], + [ + 3, + 6 + ], + [ + 9, + 12 + ], + [ + 10, + 15 ] ] } \ No newline at end of file diff --git a/Forest/Assets/Config/Level/level72.json.meta b/Forest/Assets/Config/Level/level72.json.meta index b95f16f..8b172df 100644 --- a/Forest/Assets/Config/Level/level72.json.meta +++ b/Forest/Assets/Config/Level/level72.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 740964d1190b3b141be48fca9c8024a6 +guid: c9cbbaa6be89170478e4f860c663a0df TextScriptImporter: externalObjects: {} userData: diff --git a/Forest/Assets/Config/Level/level73.json b/Forest/Assets/Config/Level/level73.json index 5b9b3a6..3b7871a 100644 --- a/Forest/Assets/Config/Level/level73.json +++ b/Forest/Assets/Config/Level/level73.json @@ -3,7 +3,7 @@ "rowCount": 6, "undoCount": 0, "addTimeCount": 0, - "openHoleCount": 1, + "openHoleCount": 0, "resetCount": 1, "holesIndex": [ 0, diff --git a/Forest/Assets/Config/Level/level74.json b/Forest/Assets/Config/Level/level74.json index 0a64a0f..5954dcf 100644 --- a/Forest/Assets/Config/Level/level74.json +++ b/Forest/Assets/Config/Level/level74.json @@ -1,60 +1,92 @@ { "columnCount": 5, "rowCount": 5, - "undoCount": 1, - "addTimeCount": 1, - "openHoleCount": 1, + "undoCount": 0, + "addTimeCount": 0, + "openHoleCount": 0, "resetCount": 1, "holesIndex": [ 0, + 2, 4, - 5, + 6, 7, - 9, - 10, + 8, 11, 12, 13, - 14, + 15, + 16, + 18, + 19, 20, 21, - 22, 23, 24 ], "emptyHoleIndex": [ - 20, - 21, - 22, + 24, 23, - 24 + 21, + 20 ], "planksType": [ - 0, - 0, - 0 + 1, + 1, + 3, + 4, + 6, + 5, + 7, + 8 ], "squareType": [ - 3, - 3, - 3 + 1, + 1, + 4, + 4, + 4, + 4, + 4, + 4 ], "HolesOfPlanksIndex": [ [ - 0, - 4 - ], - [ - 10, + 6, 11, - 12, - 13, - 14 + 16 ], [ - 5, + 8, + 13, + 18 + ], + [ + 0, + 6 + ], + [ + 4, + 8 + ], + [ + 18, + 19, + 13 + ], + [ + 16, + 15, + 11 + ], + [ + 2, + 6, 7, - 9 + 8 + ], + [ + 12 ] ] } \ No newline at end of file diff --git a/Forest/Assets/Config/Level/level74.json.meta b/Forest/Assets/Config/Level/level74.json.meta index fa8fedc..61d9e34 100644 --- a/Forest/Assets/Config/Level/level74.json.meta +++ b/Forest/Assets/Config/Level/level74.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2742d7e69c170e846b27ed73a75f3f4d +guid: a9c0b4a3ab4804840bb2cf02c9405102 TextScriptImporter: externalObjects: {} userData: diff --git a/Forest/Assets/Config/Level/level8.json b/Forest/Assets/Config/Level/level8.json index d4cf762..965483e 100644 --- a/Forest/Assets/Config/Level/level8.json +++ b/Forest/Assets/Config/Level/level8.json @@ -1,44 +1,55 @@ { "columnCount": 5, - "rowCount": 6, + "rowCount": 4, "undoCount": 0, "addTimeCount": 0, - "openHoleCount": 1, + "openHoleCount": 0, "resetCount": 1, "holesIndex": [ + 0, + 1, 2, + 3, + 4, + 5, 6, 7, 8, + 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, - 22, - 27 + 19 ], "emptyHoleIndex": [ - 22, - 27, + 7, + 17, + 12, 2 ], "planksType": [ - 0, - 1, + 2, + 2, + 3, 3, 4, 4, - 3, + 5, + 6, 8, 8 ], "squareType": [ - 1, - 1, + 4, + 4, + 4, + 4, 4, 4, 4, @@ -48,36 +59,48 @@ ], "HolesOfPlanksIndex": [ [ + 10, 11, - 12, - 13 - ], - [ - 7, - 12, - 17 - ], - [ - 6, - 12 - ], - [ - 8, - 12 - ], - [ - 12, + 15, 16 ], [ - 12, - 18 + 13, + 14, + 18, + 19 ], [ + 8, 14 ], [ + 0, + 6 + ], + [ + 6, 10 + ], + [ + 4, + 8 + ], + [ + 6, + 5, + 1 + ], + [ + 8, + 9, + 3 + ], + [ + 9 + ], + [ + 5 ] ] } \ No newline at end of file diff --git a/Forest/Assets/Config/Level/level8.json.meta b/Forest/Assets/Config/Level/level8.json.meta index d7bdfa7..fb32421 100644 --- a/Forest/Assets/Config/Level/level8.json.meta +++ b/Forest/Assets/Config/Level/level8.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4ca8581484631904bb98b97b9abe2f04 +guid: 0eaebf9c6fd7e9949ad4a13c3015cd96 TextScriptImporter: externalObjects: {} userData: diff --git a/Forest/Assets/Config/Level/level82.json b/Forest/Assets/Config/Level/level82.json index 0e012b3..9dd4344 100644 --- a/Forest/Assets/Config/Level/level82.json +++ b/Forest/Assets/Config/Level/level82.json @@ -1,59 +1,49 @@ { - "columnCount": 5, + "columnCount": 4, "rowCount": 5, - "undoCount": 1, - "addTimeCount": 1, - "openHoleCount": 1, + "undoCount": 0, + "addTimeCount": 0, + "openHoleCount": 0, "resetCount": 1, "holesIndex": [ + 0, 1, 2, 3, + 4, 5, 6, 7, - 8, 9, 10, - 11, + 12, 13, 14, - 16, + 15, 17, - 18, - 20, - 21, - 23, - 24 + 18 ], "emptyHoleIndex": [ - 20, - 21, - 23, - 24, - 17 + 0, + 1, + 2, + 3 ], "planksType": [ 0, - 1, - 1, - 3, - 3, - 3, + 0, + 0, + 0, 3, 4, 4, - 4, - 4 + 3 ], "squareType": [ - 3, 2, 2, - 4, - 4, - 4, - 4, + 0, + 0, 4, 4, 4, @@ -61,55 +51,40 @@ ], "HolesOfPlanksIndex": [ [ - 5, - 6, - 7, - 8, - 9 + 12, + 13, + 14, + 15 + ], + [ + 4, + 5, + 6, + 7 + ], + [ + 17, + 18 + ], + [ + 9, + 10 ], [ - 3, - 8, 13, 18 ], - [ - 1, - 6, - 11, - 16 - ], - [ - 10, - 16 - ], - [ - 7, - 13 - ], - [ - 8, - 14 - ], - [ - 2, - 8 - ], [ 14, - 18 - ], - [ - 7, - 11 + 17 ], [ 6, - 10 + 9 ], [ - 2, - 6 + 5, + 10 ] ] } \ No newline at end of file diff --git a/Forest/Assets/Config/Level/level82.json.meta b/Forest/Assets/Config/Level/level82.json.meta index af199cd..1188f7d 100644 --- a/Forest/Assets/Config/Level/level82.json.meta +++ b/Forest/Assets/Config/Level/level82.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c4c8b0386a8acba478ff1e54728cf396 +guid: fc2fc0e8880b4c84a8805b8fb82aee31 TextScriptImporter: externalObjects: {} userData: diff --git a/Forest/Assets/Config/Level/level83.json b/Forest/Assets/Config/Level/level83.json index f9ce097..b634991 100644 --- a/Forest/Assets/Config/Level/level83.json +++ b/Forest/Assets/Config/Level/level83.json @@ -1,7 +1,7 @@ { "columnCount": 3, "rowCount": 7, - "undoCount": 1, + "undoCount": 0, "addTimeCount": 0, "openHoleCount": 0, "resetCount": 1, diff --git a/Forest/Assets/Config/Level/level84.json b/Forest/Assets/Config/Level/level84.json index 5fa9fd6..062b125 100644 --- a/Forest/Assets/Config/Level/level84.json +++ b/Forest/Assets/Config/Level/level84.json @@ -1,9 +1,9 @@ { "columnCount": 5, "rowCount": 5, - "undoCount": 1, - "addTimeCount": 1, - "openHoleCount": 1, + "undoCount": 0, + "addTimeCount": 0, + "openHoleCount": 0, "resetCount": 1, "holesIndex": [ 0, diff --git a/Forest/Assets/Config/Level/level85.json b/Forest/Assets/Config/Level/level85.json index 8966b2c..c1d225a 100644 --- a/Forest/Assets/Config/Level/level85.json +++ b/Forest/Assets/Config/Level/level85.json @@ -1,8 +1,8 @@ { "columnCount": 4, "rowCount": 6, - "undoCount": 2, - "addTimeCount": 1, + "undoCount": 0, + "addTimeCount": 0, "openHoleCount": 0, "resetCount": 1, "holesIndex": [ diff --git a/Forest/Assets/Config/Level/level86.json b/Forest/Assets/Config/Level/level86.json index cdc73a9..d4cf762 100644 --- a/Forest/Assets/Config/Level/level86.json +++ b/Forest/Assets/Config/Level/level86.json @@ -1,55 +1,44 @@ { "columnCount": 5, - "rowCount": 4, - "undoCount": 1, - "addTimeCount": 1, + "rowCount": 6, + "undoCount": 0, + "addTimeCount": 0, "openHoleCount": 1, "resetCount": 1, "holesIndex": [ - 0, - 1, 2, - 3, - 4, - 5, 6, 7, 8, - 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, - 19 + 22, + 27 ], "emptyHoleIndex": [ - 7, - 17, - 12, + 22, + 27, 2 ], "planksType": [ - 2, - 2, - 3, + 0, + 1, 3, 4, 4, - 5, - 6, + 3, 8, 8 ], "squareType": [ - 4, - 4, - 4, - 4, + 1, + 1, 4, 4, 4, @@ -59,48 +48,36 @@ ], "HolesOfPlanksIndex": [ [ - 10, 11, - 15, + 12, + 13 + ], + [ + 7, + 12, + 17 + ], + [ + 6, + 12 + ], + [ + 8, + 12 + ], + [ + 12, 16 ], [ - 13, - 14, - 18, - 19 + 12, + 18 ], [ - 8, 14 ], [ - 0, - 6 - ], - [ - 6, 10 - ], - [ - 4, - 8 - ], - [ - 6, - 5, - 1 - ], - [ - 8, - 9, - 3 - ], - [ - 9 - ], - [ - 5 ] ] } \ No newline at end of file diff --git a/Forest/Assets/Config/Level/level86.json.meta b/Forest/Assets/Config/Level/level86.json.meta index fb32421..d7bdfa7 100644 --- a/Forest/Assets/Config/Level/level86.json.meta +++ b/Forest/Assets/Config/Level/level86.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0eaebf9c6fd7e9949ad4a13c3015cd96 +guid: 4ca8581484631904bb98b97b9abe2f04 TextScriptImporter: externalObjects: {} userData: diff --git a/Forest/Assets/Config/Level/level9.json b/Forest/Assets/Config/Level/level9.json index 43272d4..9fda984 100644 --- a/Forest/Assets/Config/Level/level9.json +++ b/Forest/Assets/Config/Level/level9.json @@ -1,60 +1,96 @@ { "columnCount": 5, - "rowCount": 5, + "rowCount": 6, "undoCount": 0, "addTimeCount": 0, "openHoleCount": 0, "resetCount": 1, "holesIndex": [ - 0, 2, - 3, - 4, 5, + 6, 7, + 8, + 9, 10, + 11, 12, 13, - 15, + 14, + 16, 17, - 20, - 22, - 23, - 24 + 18, + 25, + 26, + 28, + 29 ], "emptyHoleIndex": [ - 0, - 10, - 5, - 15, - 20 + 26, + 25, + 29, + 28 ], "planksType": [ + 0, 1, - 1, - 1 + 3, + 4, + 8, + 8, + 8, + 8, + 8, + 8 ], "squareType": [ - 3, - 3, - 3 + 1, + 1, + 4, + 4, + 4, + 4, + 4, + 4, + 4, + 4 ], "HolesOfPlanksIndex": [ + [ + 6, + 7, + 8 + ], [ 2, 7, - 12, - 17, - 22 + 12 ], [ - 3, - 13, - 23 + 10, + 16 ], [ - 4, - 24 + 14, + 18 + ], + [ + 5 + ], + [ + 2 + ], + [ + 9 + ], + [ + 17 + ], + [ + 13 + ], + [ + 11 ] ] } \ No newline at end of file diff --git a/Forest/Assets/Config/Level/level9.json.meta b/Forest/Assets/Config/Level/level9.json.meta index 7fc8e41..9cbb379 100644 --- a/Forest/Assets/Config/Level/level9.json.meta +++ b/Forest/Assets/Config/Level/level9.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 19b79b47c0374064a8bc1a3e6e447ceb +guid: a065e61813470f84ba92f7a384fb40a7 TextScriptImporter: externalObjects: {} userData: diff --git a/Forest/Assets/Config/Level/level99.json b/Forest/Assets/Config/Level/level99.json index a517e61..27973d7 100644 --- a/Forest/Assets/Config/Level/level99.json +++ b/Forest/Assets/Config/Level/level99.json @@ -1,64 +1,45 @@ { - "columnCount": 5, - "rowCount": 7, - "undoCount": 0, + "columnCount": 4, + "rowCount": 5, + "undoCount": 1, "addTimeCount": 0, "openHoleCount": 0, - "resetCount": 1, + "resetCount": 0, "holesIndex": [ 0, 1, 2, 3, - 4, + 5, + 6, + 9, 10, 12, + 13, 14, + 15, 16, 17, 18, - 20, - 21, - 22, - 23, - 24, - 26, - 27, - 28, - 30, - 32, - 34 + 19 ], "emptyHoleIndex": [ - 4, - 3, - 2, + 0, 1, - 0 + 2, + 3 ], "planksType": [ - 0, - 0, - 0, - 1, 1, 1, + 2, + 2, 3, - 3, - 4, - 4, - 7, - 10 + 4 ], "squareType": [ - 3, - 3, - 3, - 3, - 3, - 3, - 4, - 4, + 2, + 2, 4, 4, 4, @@ -66,66 +47,36 @@ ], "HolesOfPlanksIndex": [ [ - 30, - 32, - 34 - ], - [ - 20, - 21, - 22, - 23, - 24 + 5, + 9, + 13, + 17 ], [ + 6, 10, + 14, + 18 + ], + [ 12, + 13, + 16, + 17 + ], + [ + 14, + 15, + 18, + 19 + ], + [ + 9, 14 ], [ 10, - 20, - 30 - ], - [ - 14, - 24, - 34 - ], - [ - 12, - 17, - 22, - 27, - 32 - ], - [ - 28, - 34 - ], - [ - 10, - 16 - ], - [ - 26, - 30 - ], - [ - 14, - 18 - ], - [ - 12, - 16, - 17, - 18 - ], - [ - 32, - 28, - 27, - 26 + 13 ] ] } \ No newline at end of file diff --git a/Forest/Assets/Config/Level/level99.json.meta b/Forest/Assets/Config/Level/level99.json.meta index 0328468..869b7b0 100644 --- a/Forest/Assets/Config/Level/level99.json.meta +++ b/Forest/Assets/Config/Level/level99.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3f322f6ed54628e4eaf89a361a6595c4 +guid: 4943ae1833d88434bb11c279322d64fc TextScriptImporter: externalObjects: {} userData: diff --git a/Forest/Assets/Plugins/Android/AndroidManifest.xml.meta b/Forest/Assets/Plugins/Android/AndroidManifest.xml.meta new file mode 100644 index 0000000..793e1aa --- /dev/null +++ b/Forest/Assets/Plugins/Android/AndroidManifest.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 298546d167cb6ae46a2438689755624f +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Forest/Assets/Plugins/Android/FirebaseCrashlytics.androidlib.meta b/Forest/Assets/Plugins/Android/FirebaseCrashlytics.androidlib.meta deleted file mode 100644 index 28ad751..0000000 --- a/Forest/Assets/Plugins/Android/FirebaseCrashlytics.androidlib.meta +++ /dev/null @@ -1,32 +0,0 @@ -fileFormatVersion: 2 -guid: 6aba91723618f4e9384fc1015c76ba71 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Android: Android - second: - enabled: 1 - settings: {} - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Forest/Assets/Scripts/Gameplay/UI/EndPanel/UIWinPanelController.cs b/Forest/Assets/Scripts/Gameplay/UI/EndPanel/UIWinPanelController.cs index c9dfef2..538fa3a 100644 --- a/Forest/Assets/Scripts/Gameplay/UI/EndPanel/UIWinPanelController.cs +++ b/Forest/Assets/Scripts/Gameplay/UI/EndPanel/UIWinPanelController.cs @@ -36,16 +36,6 @@ public class UIWinPanelController : UIWindow OnStart(); } - private void Update() - { - /*if (LevelManager.Instance.CanGfxCoin && Time.time > _lastSpawnTime + LevelConstants.SpawnInterval && - LevelManager.Instance.GfxCoins.Count <= LevelConstants.MaxGfxCoinsNumber) - { - SpawnCoin(); - _lastSpawnTime = Time.time; - }*/ - } - private IEnumerator TransitionNumber(int newNumber) { var duration = 2.0f; @@ -84,6 +74,7 @@ public class UIWinPanelController : UIWindow BIManager.Instance.TrackEventLevel(cfg.BI.Event.level_back_home, BIManager.Reason.ClickOnWinPanel.ToString()); CloseWindow(); + UIManager.Instance.CloseWindow(UIConstants.UILevelPanel, true); GameStateManager.Instance.ChangeState(new GameStateStart(UIConstants.UIMainPanel)); }