Level 1-20

AlvirBond · AlvirBond · commit 6388a8c74cb3 · 2023-04-03T18:18:50.000+03:00
Level 1-20 ready for test
diff --git a/Assets/ScriptableObjects/Levels/Level 1/ColorIdLevelGoalCondition 1.asset b/Assets/ScriptableObjects/Levels/Level 1/ColorIdLevelGoalCondition 1.asset
@@ -12,5 +12,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e812fceaf4f33e4478e42214eca713a3, type: 3}
   m_Name: ColorIdLevelGoalCondition 1
   m_EditorClassIdentifier: 
-  _goalAmount: 15
+  _goalAmount: 20
   _id: 0
diff --git a/Assets/ScriptableObjects/Levels/Level 1/Level 1.asset b/Assets/ScriptableObjects/Levels/Level 1/Level 1.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 46a54c8103ba39c4bb6c583651c066c0, type: 3}
   m_Name: Level 1
   m_EditorClassIdentifier: 
-  _moves: 35
+  _moves: 25
   _levelGoalConditions:
   - {fileID: 11400000, guid: 8c7ed04427eb4dd4091d6b1b5d3aeec0, type: 2}
   _poolMap: {fileID: 2800000, guid: efa4ad145318245459054296c3b181ad, type: 3}
diff --git a/Assets/ScriptableObjects/Levels/Level 10/ColorIdLevelGoalCondition 1.asset b/Assets/ScriptableObjects/Levels/Level 10/ColorIdLevelGoalCondition 1.asset
@@ -13,4 +13,4 @@ MonoBehaviour:
   m_Name: ColorIdLevelGoalCondition 1
   m_EditorClassIdentifier: 
   _goalAmount: 35
-  _id: 2
+  _id: 0
diff --git a/Assets/ScriptableObjects/Levels/Level 10/Level 10.asset b/Assets/ScriptableObjects/Levels/Level 10/Level 10.asset
@@ -15,5 +15,6 @@ MonoBehaviour:
   _moves: 20
   _levelGoalConditions:
   - {fileID: 11400000, guid: 6e6e85982ee8ced429a37c8e89601d42, type: 2}
+  - {fileID: 11400000, guid: a2372d82f816bf34c8556e6d24684525, type: 2}
   _poolMap: {fileID: 2800000, guid: 41e43bc243deeae4ea6cfa6403e0ba7e, type: 3}
   _cellMap: {fileID: 2800000, guid: fdd6c66dcb3c6c243bad19e1f2874d5f, type: 3}
diff --git a/Assets/ScriptableObjects/Levels/Level 11/ColorIdLevelGoalCondition.asset b/Assets/ScriptableObjects/Levels/Level 11/ColorIdLevelGoalCondition.asset
@@ -12,5 +12,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e812fceaf4f33e4478e42214eca713a3, type: 3}
   m_Name: ColorIdLevelGoalCondition
   m_EditorClassIdentifier: 
-  _goalAmount: 30
+  _goalAmount: 25
   _id: 1
diff --git a/Assets/ScriptableObjects/Levels/Level 11/Level 11.asset b/Assets/ScriptableObjects/Levels/Level 11/Level 11.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 46a54c8103ba39c4bb6c583651c066c0, type: 3}
   m_Name: Level 11
   m_EditorClassIdentifier: 
-  _moves: 10
+  _moves: 20
   _levelGoalConditions:
   - {fileID: 11400000, guid: 9e7beb14e83543c438221493c81a51e2, type: 2}
   - {fileID: 11400000, guid: c7324d0f8b9599e4087b51557816b293, type: 2}
diff --git a/Assets/ScriptableObjects/Levels/Level 11/lvl-11.png b/Assets/ScriptableObjects/Levels/Level 11/lvl-11.png
diff --git a/Assets/ScriptableObjects/Levels/Level 12/SpritePULL.png b/Assets/ScriptableObjects/Levels/Level 12/SpritePULL.png
diff --git a/Assets/ScriptableObjects/Levels/Level 14/Level 14.asset b/Assets/ScriptableObjects/Levels/Level 14/Level 14.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 46a54c8103ba39c4bb6c583651c066c0, type: 3}
   m_Name: Level 14
   m_EditorClassIdentifier: 
-  _moves: 15
+  _moves: 18
   _levelGoalConditions:
   - {fileID: 11400000, guid: 6c20939d4628e9a47958e6f6445f79aa, type: 2}
   - {fileID: 11400000, guid: 336283400cdde0e46ab7f7ba798d7a83, type: 2}
diff --git a/Assets/ScriptableObjects/Levels/Level 14/StateLevelGoalCondition.asset b/Assets/ScriptableObjects/Levels/Level 14/StateLevelGoalCondition.asset
@@ -12,5 +12,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 88b68a41f1cbae241b7fa89d31a2c6eb, type: 3}
   m_Name: StateLevelGoalCondition
   m_EditorClassIdentifier: 
-  _goalAmount: 7
+  _goalAmount: 5
   _state: 103
diff --git a/Assets/ScriptableObjects/Levels/Level 15/lvl-15.png b/Assets/ScriptableObjects/Levels/Level 15/lvl-15.png
diff --git a/Assets/ScriptableObjects/Levels/Level 16/lvl-16.png b/Assets/ScriptableObjects/Levels/Level 16/lvl-16.png
diff --git a/Assets/ScriptableObjects/Levels/Level 18/Level 18.asset b/Assets/ScriptableObjects/Levels/Level 18/Level 18.asset
@@ -12,7 +12,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 46a54c8103ba39c4bb6c583651c066c0, type: 3}
   m_Name: Level 18
   m_EditorClassIdentifier: 
-  _moves: 0
-  _levelGoalConditions: []
-  _poolMap: {fileID: 0}
-  _cellMap: {fileID: 0}
+  _moves: 15
+  _levelGoalConditions:
+  - {fileID: 11400000, guid: d6ace4633b603df43b2bd3081b80fac2, type: 2}
+  _poolMap: {fileID: 2800000, guid: 81e8226f60714fb48bb502dcf53f3f89, type: 3}
+  _cellMap: {fileID: 2800000, guid: 5bd3ab1b2b1742b4a870f093b2aaec2e, type: 3}
diff --git a/Assets/ScriptableObjects/Levels/Level 18/StateLevelGoalCondition.asset b/Assets/ScriptableObjects/Levels/Level 18/StateLevelGoalCondition.asset
@@ -12,5 +12,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 88b68a41f1cbae241b7fa89d31a2c6eb, type: 3}
   m_Name: StateLevelGoalCondition
   m_EditorClassIdentifier: 
-  _goalAmount: 3
-  _state: 103
+  _goalAmount: 12
+  _state: 102
diff --git a/Assets/ScriptableObjects/Levels/Level 19/SpritePULL.png b/Assets/ScriptableObjects/Levels/Level 19/SpritePULL.png
diff --git a/Assets/ScriptableObjects/Levels/Level 19/lvl-19.png b/Assets/ScriptableObjects/Levels/Level 19/lvl-19.png
diff --git a/Assets/ScriptableObjects/Levels/Level 2/BoostLevelGoalCondition.asset b/Assets/ScriptableObjects/Levels/Level 2/BoostLevelGoalCondition.asset
@@ -12,5 +12,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2ee8b800abda3a74ca1d86294c5600bc, type: 3}
   m_Name: BoostLevelGoalCondition
   m_EditorClassIdentifier: 
-  _goalAmount: 100
-  _type: 1002
+  _goalAmount: 7
+  _types: eb030000ea030000
diff --git a/Assets/ScriptableObjects/Levels/Level 2/Level 2.asset b/Assets/ScriptableObjects/Levels/Level 2/Level 2.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 46a54c8103ba39c4bb6c583651c066c0, type: 3}
   m_Name: Level 2
   m_EditorClassIdentifier: 
-  _moves: 25
+  _moves: 20
   _levelGoalConditions:
   - {fileID: 11400000, guid: a82321cf1e74d244f89e6bebce8c0a03, type: 2}
   - {fileID: 11400000, guid: ae6bc50ae73c9b84eb7a8b8f91197a3a, type: 2}
diff --git a/Assets/ScriptableObjects/Levels/Level 20/BoostLevelGoalCondition.asset b/Assets/ScriptableObjects/Levels/Level 20/BoostLevelGoalCondition.asset
@@ -13,4 +13,4 @@ MonoBehaviour:
   m_Name: BoostLevelGoalCondition
   m_EditorClassIdentifier: 
   _goalAmount: 5
-  _types: ed030000
+  _types: e9030000
diff --git a/Assets/ScriptableObjects/Levels/Level 20/ColorIdLevelGoalCondition.asset b/Assets/ScriptableObjects/Levels/Level 20/ColorIdLevelGoalCondition.asset
@@ -12,5 +12,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e812fceaf4f33e4478e42214eca713a3, type: 3}
   m_Name: ColorIdLevelGoalCondition
   m_EditorClassIdentifier: 
-  _goalAmount: 15
-  _id: 0
+  _goalAmount: 35
+  _id: 1
diff --git a/Assets/ScriptableObjects/Levels/Level 20/Level 20.asset b/Assets/ScriptableObjects/Levels/Level 20/Level 20.asset
@@ -12,9 +12,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 46a54c8103ba39c4bb6c583651c066c0, type: 3}
   m_Name: Level 20
   m_EditorClassIdentifier: 
-  _moves: 18
+  _moves: 21
   _levelGoalConditions:
   - {fileID: 11400000, guid: 5fcb6a7ee4588d347a49968071eca626, type: 2}
-  - {fileID: 0}
-  _poolMap: {fileID: 2800000, guid: 3fca668ed00e398438d8d3af8597f116, type: 3}
+  - {fileID: 11400000, guid: 857ab43bc5b0d4f4f9ab5671c1d86ce3, type: 2}
+  _poolMap: {fileID: 2800000, guid: d36e06014001c3a499b9aceedd0b89f5, type: 3}
   _cellMap: {fileID: 2800000, guid: 3449621e752fc6a45aad61efeef092e1, type: 3}
diff --git a/Assets/ScriptableObjects/Levels/Level 3/ColorIdLevelGoalCondition.asset b/Assets/ScriptableObjects/Levels/Level 3/ColorIdLevelGoalCondition.asset
@@ -13,4 +13,4 @@ MonoBehaviour:
   m_Name: ColorIdLevelGoalCondition
   m_EditorClassIdentifier: 
   _goalAmount: 30
-  _id: 0
+  _id: 2
diff --git a/Assets/ScriptableObjects/Levels/Level 3/Level 3.asset b/Assets/ScriptableObjects/Levels/Level 3/Level 3.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 46a54c8103ba39c4bb6c583651c066c0, type: 3}
   m_Name: Level 3
   m_EditorClassIdentifier: 
-  _moves: 30
+  _moves: 25
   _levelGoalConditions:
   - {fileID: 11400000, guid: dcd19ba4aa937e3438770cd2050415f1, type: 2}
   - {fileID: 11400000, guid: e159ddca286a4c5478645f1d728f1092, type: 2}
diff --git a/Assets/ScriptableObjects/Levels/Level 4/BoostLevelGoalCondition.asset b/Assets/ScriptableObjects/Levels/Level 4/BoostLevelGoalCondition.asset
@@ -12,5 +12,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2ee8b800abda3a74ca1d86294c5600bc, type: 3}
   m_Name: BoostLevelGoalCondition
   m_EditorClassIdentifier: 
-  _goalAmount: 5
-  _type: 1001
+  _goalAmount: 7
+  _types: e9030000
diff --git a/Assets/ScriptableObjects/Levels/Level 4/ColorIdLevelGoalCondition.asset b/Assets/ScriptableObjects/Levels/Level 4/ColorIdLevelGoalCondition.asset
@@ -13,4 +13,4 @@ MonoBehaviour:
   m_Name: ColorIdLevelGoalCondition
   m_EditorClassIdentifier: 
   _goalAmount: 20
-  _id: 2
+  _id: 3
diff --git a/Assets/ScriptableObjects/Levels/Level 6/BoostLevelGoalCondition.asset b/Assets/ScriptableObjects/Levels/Level 6/BoostLevelGoalCondition.asset
@@ -13,4 +13,4 @@ MonoBehaviour:
   m_Name: BoostLevelGoalCondition
   m_EditorClassIdentifier: 
   _goalAmount: 6
-  _type: 1005
+  _types: ed030000
diff --git a/Assets/ScriptableObjects/Levels/Level 6/ColorIdLevelGoalCondition.asset b/Assets/ScriptableObjects/Levels/Level 6/ColorIdLevelGoalCondition.asset
@@ -12,5 +12,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e812fceaf4f33e4478e42214eca713a3, type: 3}
   m_Name: ColorIdLevelGoalCondition
   m_EditorClassIdentifier: 
-  _goalAmount: 15
+  _goalAmount: 20
   _id: 3
diff --git a/Assets/ScriptableObjects/Levels/Level 7/ColorIdLevelGoalCondition.asset b/Assets/ScriptableObjects/Levels/Level 7/ColorIdLevelGoalCondition.asset
@@ -12,5 +12,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e812fceaf4f33e4478e42214eca713a3, type: 3}
   m_Name: ColorIdLevelGoalCondition
   m_EditorClassIdentifier: 
-  _goalAmount: 15
+  _goalAmount: 25
   _id: 1
diff --git a/Assets/ScriptableObjects/Levels/Level 7/Level 7.asset b/Assets/ScriptableObjects/Levels/Level 7/Level 7.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 46a54c8103ba39c4bb6c583651c066c0, type: 3}
   m_Name: Level 7
   m_EditorClassIdentifier: 
-  _moves: 25
+  _moves: 20
   _levelGoalConditions:
   - {fileID: 11400000, guid: fda2803d97fdf28439cde9ab0ea24d5e, type: 2}
   - {fileID: 11400000, guid: 2f3664ee27549c149940154263f62a08, type: 2}
diff --git a/Assets/ScriptableObjects/Levels/Level 8/BoostLevelGoalCondition 1.asset b/Assets/ScriptableObjects/Levels/Level 8/BoostLevelGoalCondition 1.asset
@@ -12,5 +12,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2ee8b800abda3a74ca1d86294c5600bc, type: 3}
   m_Name: BoostLevelGoalCondition 1
   m_EditorClassIdentifier: 
-  _goalAmount: 5
-  _type: 1005
+  _goalAmount: 6
+  _types: ed030000
diff --git a/Assets/ScriptableObjects/Levels/Level 8/BoostLevelGoalCondition.asset b/Assets/ScriptableObjects/Levels/Level 8/BoostLevelGoalCondition.asset
@@ -12,5 +12,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2ee8b800abda3a74ca1d86294c5600bc, type: 3}
   m_Name: BoostLevelGoalCondition
   m_EditorClassIdentifier: 
-  _goalAmount: 5
-  _type: 1001
+  _goalAmount: 6
+  _types: e9030000
diff --git a/Assets/ScriptableObjects/Levels/Level 8/Level 8.asset b/Assets/ScriptableObjects/Levels/Level 8/Level 8.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 46a54c8103ba39c4bb6c583651c066c0, type: 3}
   m_Name: Level 8
   m_EditorClassIdentifier: 
-  _moves: 15
+  _moves: 17
   _levelGoalConditions:
   - {fileID: 11400000, guid: d171b75e9a520fb4181c656619e965b8, type: 2}
   - {fileID: 11400000, guid: f9de7f597bf46f748881474ca66d04f3, type: 2}
diff --git a/Assets/ScriptableObjects/Levels/Level 9/BoostLevelGoalCondition.asset b/Assets/ScriptableObjects/Levels/Level 9/BoostLevelGoalCondition.asset
@@ -13,4 +13,4 @@ MonoBehaviour:
   m_Name: BoostLevelGoalCondition
   m_EditorClassIdentifier: 
   _goalAmount: 4
-  _type: 1004
+  _types: ec030000
diff --git a/Assets/ScriptableObjects/Levels/Levels.asset b/Assets/ScriptableObjects/Levels/Levels.asset
@@ -13,14 +13,23 @@ MonoBehaviour:
   m_Name: Levels
   m_EditorClassIdentifier: 
   _levels:
+  - {fileID: 11400000, guid: ab2e9c59beb93e44a876e6e79d14934e, type: 2}
   - {fileID: 11400000, guid: a555c1d7d7ddacc4887a07dabd9976d2, type: 2}
-  - {fileID: 11400000, guid: a555c1d7d7ddacc4887a07dabd9976d2, type: 2}
+  - {fileID: 11400000, guid: f9db246a5941ff645a083ac5150ce1e7, type: 2}
   - {fileID: 11400000, guid: 8b3cac793ffe44a4fa33915bee84a0a2, type: 2}
   - {fileID: 11400000, guid: a907a110b5f04c2489575a094c8fd533, type: 2}
   - {fileID: 11400000, guid: ef1322f8b1a7f734fb3461540c3cabbf, type: 2}
+  - {fileID: 11400000, guid: 5146cd563645fd041b0283d2de6a4a15, type: 2}
   - {fileID: 11400000, guid: 8c558829b69491443aebbf89f9c10edd, type: 2}
   - {fileID: 11400000, guid: ba1a2769e7668bb49a70f10a86edcd1c, type: 2}
   - {fileID: 11400000, guid: dae7e9792f8d5774292a944bd2ad1250, type: 2}
   - {fileID: 11400000, guid: d6aeb77fa82a2a0488dea096946304c0, type: 2}
+  - {fileID: 11400000, guid: b36d6b4ce759c264f8931759d122b2ef, type: 2}
+  - {fileID: 11400000, guid: 5e3ee75d318f63344ba7c75e0f39c67a, type: 2}
+  - {fileID: 11400000, guid: 713ba49b5dd872345a9c0a43e045ef9f, type: 2}
   - {fileID: 11400000, guid: 969abf9905e44c34a83e9618e313130d, type: 2}
+  - {fileID: 11400000, guid: 15a99b2ddf32a1a478a2ae41a0d15119, type: 2}
   - {fileID: 11400000, guid: b15f35c4fb114e9479c5e1fe3cd7f096, type: 2}
+  - {fileID: 11400000, guid: 920b6c1885d43fb439798895a4ec91a2, type: 2}
+  - {fileID: 11400000, guid: a38ad66e62dc02740aa4725e1ffce7a5, type: 2}
+  - {fileID: 11400000, guid: 8d8ac44a2d8598042926097d963d74a7, type: 2}
diff --git a/Assets/StreamingAssets/google-services-desktop.json.meta b/Assets/StreamingAssets/google-services-desktop.json.meta
