From 4e95765d98739129b80cca869481fe50f3ee8e10 Mon Sep 17 00:00:00 2001 From: milan Date: Mon, 5 Dec 2022 10:52:00 +0100 Subject: [PATCH] add puzzle names --- .../Assets/Modules/{Puzzle B.meta => Hexagon Puzzle.meta} | 0 .../Assets/Modules/{Puzzle B => Hexagon Puzzle}/Easy.meta | 0 .../Easy/Hexagon Easy.asset} | 4 +++- .../Easy/Hexagon Easy.asset.meta} | 0 .../Easy/Hexagon Easy.prefab} | 2 +- .../Easy/Hexagon Easy.prefab.meta} | 0 .../Modules/{Puzzle B => Hexagon Puzzle}/Medium.meta | 0 .../Medium/Hexagon Medium.asset} | 4 +++- .../Medium/Hexagon Medium.asset.meta} | 0 .../Medium/Hexagon Medium.prefab} | 0 .../Medium/Hexagon Medium.prefab.meta} | 0 .../Modules/{Puzzle B => Hexagon Puzzle}/Rotator.prefab | 0 .../{Puzzle B => Hexagon Puzzle}/Rotator.prefab.meta | 0 .../Assets/Modules/{Puzzle C.meta => Holes Puzzle.meta} | 0 .../Assets/Modules/{Puzzle C => Holes Puzzle}/Hole.prefab | 0 .../Modules/{Puzzle C => Holes Puzzle}/Hole.prefab.meta | 0 .../Holes Dispenser Relation.asset} | 2 +- .../Holes Dispenser Relation.asset.meta} | 0 .../Holes Dispenser.asset} | 2 +- .../Holes Dispenser.asset.meta} | 0 .../Holes Dispenser.prefab} | 0 .../Holes Dispenser.prefab.meta} | 0 .../Easy/Puzzle C Easy.asset => Holes Puzzle/Holes.asset} | 4 +++- .../Holes.asset.meta} | 0 .../Modules/{Puzzle C => Holes Puzzle}/Holes.prefab | 0 .../Modules/{Puzzle C => Holes Puzzle}/Holes.prefab.meta | 0 .../Modules/{Puzzle D.meta => Hoop Fling Puzzle.meta} | 0 .../Hoop Fling.asset} | 2 +- .../Hoop Fling.asset.meta} | 0 .../Modules/{Puzzle A.meta => Position Order Puzzle.meta} | 2 +- .../Position Ball Relation.asset} | 2 +- .../Position Ball Relation.asset.meta} | 0 .../Position Ball.asset} | 2 +- .../Position Ball.asset.meta} | 0 .../Position Ball.prefab} | 0 .../Position Ball.prefab.meta} | 0 .../Position Order.asset} | 4 +++- .../Position Order.asset.meta} | 0 .../Medium => Position Order Puzzle}/Terminal.prefab | 0 .../Medium => Position Order Puzzle}/Terminal.prefab.meta | 0 Assets/Desert/Assets/Modules/Puzzle A/Medium.meta | 8 -------- Assets/Desert/Assets/Modules/Puzzle C/Easy.meta | 8 -------- Assets/Desert/Assets/Modules/Puzzle D/Easy.meta | 8 -------- .../{Puzzle A/Easy.meta => Symbol Order Puzzle.meta} | 2 +- .../Symbol Ball Relation.asset} | 2 +- .../Symbol Ball Relation.asset.meta} | 0 .../Ball.asset => Symbol Order Puzzle/Symbol Ball.asset} | 2 +- .../Symbol Ball.asset.meta} | 0 .../Symbol Ball.prefab} | 0 .../Symbol Ball.prefab.meta} | 0 .../Symbol Order.asset} | 4 +++- .../Symbol Order.asset.meta} | 0 .../Easy => Symbol Order Puzzle}/Terminal.prefab | 0 .../Easy => Symbol Order Puzzle}/Terminal.prefab.meta | 0 .../Dispenser/Dispenser Relation.asset} | 2 +- .../Dispenser/Dispenser Relation.asset.meta} | 0 .../Dispenser/Dispenser.asset} | 2 +- .../Dispenser/Dispenser.asset.meta} | 0 Assets/Engine/Runtime/Measurements.meta | 3 +++ Assets/Engine/Runtime/Measurements/Measure.cs | 7 +++++++ Assets/Engine/Runtime/Measurements/Measure.cs.meta | 3 +++ Assets/Engine/Runtime/Measurements/PuzzleMeasurements.cs | 7 +++++++ .../Runtime/Measurements/PuzzleMeasurements.cs.meta | 3 +++ Assets/Engine/Runtime/Modules/PuzzleModuleDescription.cs | 6 +++++- 64 files changed, 55 insertions(+), 42 deletions(-) rename Assets/Desert/Assets/Modules/{Puzzle B.meta => Hexagon Puzzle.meta} (100%) rename Assets/Desert/Assets/Modules/{Puzzle B => Hexagon Puzzle}/Easy.meta (100%) rename Assets/Desert/Assets/Modules/{Puzzle B/Easy/Puzzle B Easy.asset => Hexagon Puzzle/Easy/Hexagon Easy.asset} (91%) rename Assets/Desert/Assets/Modules/{Puzzle B/Easy/Puzzle B Easy.asset.meta => Hexagon Puzzle/Easy/Hexagon Easy.asset.meta} (100%) rename Assets/Desert/Assets/Modules/{Puzzle B/Easy/Puzzle.prefab => Hexagon Puzzle/Easy/Hexagon Easy.prefab} (99%) rename Assets/Desert/Assets/Modules/{Puzzle B/Easy/Puzzle.prefab.meta => Hexagon Puzzle/Easy/Hexagon Easy.prefab.meta} (100%) rename Assets/Desert/Assets/Modules/{Puzzle B => Hexagon Puzzle}/Medium.meta (100%) rename Assets/Desert/Assets/Modules/{Puzzle B/Medium/Puzzle B Medium.asset => Hexagon Puzzle/Medium/Hexagon Medium.asset} (91%) rename Assets/Desert/Assets/Modules/{Puzzle B/Medium/Puzzle B Medium.asset.meta => Hexagon Puzzle/Medium/Hexagon Medium.asset.meta} (100%) rename Assets/Desert/Assets/Modules/{Puzzle B/Medium/Puzzle.prefab => Hexagon Puzzle/Medium/Hexagon Medium.prefab} (100%) rename Assets/Desert/Assets/Modules/{Puzzle B/Medium/Puzzle.prefab.meta => Hexagon Puzzle/Medium/Hexagon Medium.prefab.meta} (100%) rename Assets/Desert/Assets/Modules/{Puzzle B => Hexagon Puzzle}/Rotator.prefab (100%) rename Assets/Desert/Assets/Modules/{Puzzle B => Hexagon Puzzle}/Rotator.prefab.meta (100%) rename Assets/Desert/Assets/Modules/{Puzzle C.meta => Holes Puzzle.meta} (100%) rename Assets/Desert/Assets/Modules/{Puzzle C => Holes Puzzle}/Hole.prefab (100%) rename Assets/Desert/Assets/Modules/{Puzzle C => Holes Puzzle}/Hole.prefab.meta (100%) rename Assets/Desert/Assets/Modules/{Puzzle C/Easy/Dispenser Easy Relation.asset => Holes Puzzle/Holes Dispenser Relation.asset} (92%) rename Assets/Desert/Assets/Modules/{Puzzle C/Easy/Dispenser Easy Relation.asset.meta => Holes Puzzle/Holes Dispenser Relation.asset.meta} (100%) rename Assets/Desert/Assets/Modules/{Puzzle C/Easy/Dispenser Easy.asset => Holes Puzzle/Holes Dispenser.asset} (96%) rename Assets/Desert/Assets/Modules/{Puzzle C/Easy/Dispenser Easy.asset.meta => Holes Puzzle/Holes Dispenser.asset.meta} (100%) rename Assets/Desert/Assets/Modules/{Puzzle C/Easy/Puzzle C Easy Dispenser.prefab => Holes Puzzle/Holes Dispenser.prefab} (100%) rename Assets/Desert/Assets/Modules/{Puzzle C/Easy/Puzzle C Easy Dispenser.prefab.meta => Holes Puzzle/Holes Dispenser.prefab.meta} (100%) rename Assets/Desert/Assets/Modules/{Puzzle C/Easy/Puzzle C Easy.asset => Holes Puzzle/Holes.asset} (92%) rename Assets/Desert/Assets/Modules/{Puzzle C/Easy/Puzzle C Easy.asset.meta => Holes Puzzle/Holes.asset.meta} (100%) rename Assets/Desert/Assets/Modules/{Puzzle C => Holes Puzzle}/Holes.prefab (100%) rename Assets/Desert/Assets/Modules/{Puzzle C => Holes Puzzle}/Holes.prefab.meta (100%) rename Assets/Desert/Assets/Modules/{Puzzle D.meta => Hoop Fling Puzzle.meta} (100%) rename Assets/Desert/Assets/Modules/{Puzzle D/Easy/Puzzle D Easy.asset => Hoop Fling Puzzle/Hoop Fling.asset} (96%) rename Assets/Desert/Assets/Modules/{Puzzle D/Easy/Puzzle D Easy.asset.meta => Hoop Fling Puzzle/Hoop Fling.asset.meta} (100%) rename Assets/Desert/Assets/Modules/{Puzzle A.meta => Position Order Puzzle.meta} (77%) rename Assets/Desert/Assets/Modules/{Puzzle A/Medium/Ball Relation.asset => Position Order Puzzle/Position Ball Relation.asset} (93%) rename Assets/Desert/Assets/Modules/{Puzzle A/Medium/Ball Relation.asset.meta => Position Order Puzzle/Position Ball Relation.asset.meta} (100%) rename Assets/Desert/Assets/Modules/{Puzzle A/Medium/Ball.asset => Position Order Puzzle/Position Ball.asset} (96%) rename Assets/Desert/Assets/Modules/{Puzzle A/Medium/Ball.asset.meta => Position Order Puzzle/Position Ball.asset.meta} (100%) rename Assets/Desert/Assets/Modules/{Puzzle A/Medium/Ball.prefab => Position Order Puzzle/Position Ball.prefab} (100%) rename Assets/Desert/Assets/Modules/{Puzzle A/Medium/Ball.prefab.meta => Position Order Puzzle/Position Ball.prefab.meta} (100%) rename Assets/Desert/Assets/Modules/{Puzzle A/Medium/Puzzle A Medium.asset => Position Order Puzzle/Position Order.asset} (91%) rename Assets/Desert/Assets/Modules/{Puzzle A/Medium/Puzzle A Medium.asset.meta => Position Order Puzzle/Position Order.asset.meta} (100%) rename Assets/Desert/Assets/Modules/{Puzzle A/Medium => Position Order Puzzle}/Terminal.prefab (100%) rename Assets/Desert/Assets/Modules/{Puzzle A/Medium => Position Order Puzzle}/Terminal.prefab.meta (100%) delete mode 100644 Assets/Desert/Assets/Modules/Puzzle A/Medium.meta delete mode 100644 Assets/Desert/Assets/Modules/Puzzle C/Easy.meta delete mode 100644 Assets/Desert/Assets/Modules/Puzzle D/Easy.meta rename Assets/Desert/Assets/Modules/{Puzzle A/Easy.meta => Symbol Order Puzzle.meta} (77%) rename Assets/Desert/Assets/Modules/{Puzzle A/Easy/Ball Relation.asset => Symbol Order Puzzle/Symbol Ball Relation.asset} (93%) rename Assets/Desert/Assets/Modules/{Puzzle A/Easy/Ball Relation.asset.meta => Symbol Order Puzzle/Symbol Ball Relation.asset.meta} (100%) rename Assets/Desert/Assets/Modules/{Puzzle A/Easy/Ball.asset => Symbol Order Puzzle/Symbol Ball.asset} (97%) rename Assets/Desert/Assets/Modules/{Puzzle A/Easy/Ball.asset.meta => Symbol Order Puzzle/Symbol Ball.asset.meta} (100%) rename Assets/Desert/Assets/Modules/{Puzzle A/Easy/Ball.prefab => Symbol Order Puzzle/Symbol Ball.prefab} (100%) rename Assets/Desert/Assets/Modules/{Puzzle A/Easy/Ball.prefab.meta => Symbol Order Puzzle/Symbol Ball.prefab.meta} (100%) rename Assets/Desert/Assets/Modules/{Puzzle A/Easy/Puzzle A Easy.asset => Symbol Order Puzzle/Symbol Order.asset} (92%) rename Assets/Desert/Assets/Modules/{Puzzle A/Easy/Puzzle A Easy.asset.meta => Symbol Order Puzzle/Symbol Order.asset.meta} (100%) rename Assets/Desert/Assets/Modules/{Puzzle A/Easy => Symbol Order Puzzle}/Terminal.prefab (100%) rename Assets/Desert/Assets/Modules/{Puzzle A/Easy => Symbol Order Puzzle}/Terminal.prefab.meta (100%) rename Assets/Desert/Assets/{Modules/Puzzle D/Easy/Dispenser Easy Relation.asset => Prefabs/Dispenser/Dispenser Relation.asset} (93%) rename Assets/Desert/Assets/{Modules/Puzzle D/Easy/Dispenser Easy Relation.asset.meta => Prefabs/Dispenser/Dispenser Relation.asset.meta} (100%) rename Assets/Desert/Assets/{Modules/Puzzle D/Easy/Dispenser Easy.asset => Prefabs/Dispenser/Dispenser.asset} (96%) rename Assets/Desert/Assets/{Modules/Puzzle D/Easy/Dispenser Easy.asset.meta => Prefabs/Dispenser/Dispenser.asset.meta} (100%) create mode 100644 Assets/Engine/Runtime/Measurements.meta create mode 100644 Assets/Engine/Runtime/Measurements/Measure.cs create mode 100644 Assets/Engine/Runtime/Measurements/Measure.cs.meta create mode 100644 Assets/Engine/Runtime/Measurements/PuzzleMeasurements.cs create mode 100644 Assets/Engine/Runtime/Measurements/PuzzleMeasurements.cs.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle B.meta b/Assets/Desert/Assets/Modules/Hexagon Puzzle.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle B.meta rename to Assets/Desert/Assets/Modules/Hexagon Puzzle.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle B/Easy.meta b/Assets/Desert/Assets/Modules/Hexagon Puzzle/Easy.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle B/Easy.meta rename to Assets/Desert/Assets/Modules/Hexagon Puzzle/Easy.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle B/Easy/Puzzle B Easy.asset b/Assets/Desert/Assets/Modules/Hexagon Puzzle/Easy/Hexagon Easy.asset similarity index 91% rename from Assets/Desert/Assets/Modules/Puzzle B/Easy/Puzzle B Easy.asset rename to Assets/Desert/Assets/Modules/Hexagon Puzzle/Easy/Hexagon Easy.asset index a7d9977..96b65ec 100644 --- a/Assets/Desert/Assets/Modules/Puzzle B/Easy/Puzzle B Easy.asset +++ b/Assets/Desert/Assets/Modules/Hexagon Puzzle/Easy/Hexagon Easy.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f928b97941e3469a9015316bb5ac1309, type: 3} - m_Name: Puzzle B Easy + m_Name: Hexagon Easy m_EditorClassIdentifier: types: 02000000 modulePrefab: {fileID: 3968590605239387249, guid: e5dce190a8604bc48b04c109b103f8b5, @@ -20,3 +20,5 @@ MonoBehaviour: - {fileID: 11400000, guid: ed4830127e9381245a6af07e42c52422, type: 2} - {fileID: 11400000, guid: 1f1825b71bae09c438a1cb52603347d6, type: 2} - {fileID: 11400000, guid: 43eb2a566a244964aa3a3319eaafe1a8, type: 2} + puzzleName: Hexagon Easy + puzzleVersion: 1 diff --git a/Assets/Desert/Assets/Modules/Puzzle B/Easy/Puzzle B Easy.asset.meta b/Assets/Desert/Assets/Modules/Hexagon Puzzle/Easy/Hexagon Easy.asset.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle B/Easy/Puzzle B Easy.asset.meta rename to Assets/Desert/Assets/Modules/Hexagon Puzzle/Easy/Hexagon Easy.asset.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle B/Easy/Puzzle.prefab b/Assets/Desert/Assets/Modules/Hexagon Puzzle/Easy/Hexagon Easy.prefab similarity index 99% rename from Assets/Desert/Assets/Modules/Puzzle B/Easy/Puzzle.prefab rename to Assets/Desert/Assets/Modules/Hexagon Puzzle/Easy/Hexagon Easy.prefab index 55b4994..8bb6677 100644 --- a/Assets/Desert/Assets/Modules/Puzzle B/Easy/Puzzle.prefab +++ b/Assets/Desert/Assets/Modules/Hexagon Puzzle/Easy/Hexagon Easy.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 1568209639435699204} - component: {fileID: 7585276547670451487} m_Layer: 0 - m_Name: Puzzle + m_Name: Hexagon Easy m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Desert/Assets/Modules/Puzzle B/Easy/Puzzle.prefab.meta b/Assets/Desert/Assets/Modules/Hexagon Puzzle/Easy/Hexagon Easy.prefab.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle B/Easy/Puzzle.prefab.meta rename to Assets/Desert/Assets/Modules/Hexagon Puzzle/Easy/Hexagon Easy.prefab.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle B/Medium.meta b/Assets/Desert/Assets/Modules/Hexagon Puzzle/Medium.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle B/Medium.meta rename to Assets/Desert/Assets/Modules/Hexagon Puzzle/Medium.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle B/Medium/Puzzle B Medium.asset b/Assets/Desert/Assets/Modules/Hexagon Puzzle/Medium/Hexagon Medium.asset similarity index 91% rename from Assets/Desert/Assets/Modules/Puzzle B/Medium/Puzzle B Medium.asset rename to Assets/Desert/Assets/Modules/Hexagon Puzzle/Medium/Hexagon Medium.asset index a8405d3..804e671 100644 --- a/Assets/Desert/Assets/Modules/Puzzle B/Medium/Puzzle B Medium.asset +++ b/Assets/Desert/Assets/Modules/Hexagon Puzzle/Medium/Hexagon Medium.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f928b97941e3469a9015316bb5ac1309, type: 3} - m_Name: Puzzle B Medium + m_Name: Hexagon Medium m_EditorClassIdentifier: types: 02000000 modulePrefab: {fileID: 4375253467126868626, guid: aea74bf9bbeb3e94bba5b275e087b8a9, @@ -20,3 +20,5 @@ MonoBehaviour: - {fileID: 11400000, guid: ed4830127e9381245a6af07e42c52422, type: 2} - {fileID: 11400000, guid: 1f1825b71bae09c438a1cb52603347d6, type: 2} - {fileID: 11400000, guid: 43eb2a566a244964aa3a3319eaafe1a8, type: 2} + puzzleName: Hexagon Medium + puzzleVersion: 1 diff --git a/Assets/Desert/Assets/Modules/Puzzle B/Medium/Puzzle B Medium.asset.meta b/Assets/Desert/Assets/Modules/Hexagon Puzzle/Medium/Hexagon Medium.asset.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle B/Medium/Puzzle B Medium.asset.meta rename to Assets/Desert/Assets/Modules/Hexagon Puzzle/Medium/Hexagon Medium.asset.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle B/Medium/Puzzle.prefab b/Assets/Desert/Assets/Modules/Hexagon Puzzle/Medium/Hexagon Medium.prefab similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle B/Medium/Puzzle.prefab rename to Assets/Desert/Assets/Modules/Hexagon Puzzle/Medium/Hexagon Medium.prefab diff --git a/Assets/Desert/Assets/Modules/Puzzle B/Medium/Puzzle.prefab.meta b/Assets/Desert/Assets/Modules/Hexagon Puzzle/Medium/Hexagon Medium.prefab.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle B/Medium/Puzzle.prefab.meta rename to Assets/Desert/Assets/Modules/Hexagon Puzzle/Medium/Hexagon Medium.prefab.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle B/Rotator.prefab b/Assets/Desert/Assets/Modules/Hexagon Puzzle/Rotator.prefab similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle B/Rotator.prefab rename to Assets/Desert/Assets/Modules/Hexagon Puzzle/Rotator.prefab diff --git a/Assets/Desert/Assets/Modules/Puzzle B/Rotator.prefab.meta b/Assets/Desert/Assets/Modules/Hexagon Puzzle/Rotator.prefab.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle B/Rotator.prefab.meta rename to Assets/Desert/Assets/Modules/Hexagon Puzzle/Rotator.prefab.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle C.meta b/Assets/Desert/Assets/Modules/Holes Puzzle.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle C.meta rename to Assets/Desert/Assets/Modules/Holes Puzzle.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle C/Hole.prefab b/Assets/Desert/Assets/Modules/Holes Puzzle/Hole.prefab similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle C/Hole.prefab rename to Assets/Desert/Assets/Modules/Holes Puzzle/Hole.prefab diff --git a/Assets/Desert/Assets/Modules/Puzzle C/Hole.prefab.meta b/Assets/Desert/Assets/Modules/Holes Puzzle/Hole.prefab.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle C/Hole.prefab.meta rename to Assets/Desert/Assets/Modules/Holes Puzzle/Hole.prefab.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle C/Easy/Dispenser Easy Relation.asset b/Assets/Desert/Assets/Modules/Holes Puzzle/Holes Dispenser Relation.asset similarity index 92% rename from Assets/Desert/Assets/Modules/Puzzle C/Easy/Dispenser Easy Relation.asset rename to Assets/Desert/Assets/Modules/Holes Puzzle/Holes Dispenser Relation.asset index 6ba4275..8492543 100644 --- a/Assets/Desert/Assets/Modules/Puzzle C/Easy/Dispenser Easy Relation.asset +++ b/Assets/Desert/Assets/Modules/Holes Puzzle/Holes Dispenser Relation.asset @@ -10,6 +10,6 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6e3f3bf07aae4a03834a7943c255f37d, type: 3} - m_Name: Dispenser Easy Relation + m_Name: Holes Dispenser Relation m_EditorClassIdentifier: relatedModule: {fileID: 11400000, guid: ddbd764c468d0e042b30bf84d12c7397, type: 2} diff --git a/Assets/Desert/Assets/Modules/Puzzle C/Easy/Dispenser Easy Relation.asset.meta b/Assets/Desert/Assets/Modules/Holes Puzzle/Holes Dispenser Relation.asset.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle C/Easy/Dispenser Easy Relation.asset.meta rename to Assets/Desert/Assets/Modules/Holes Puzzle/Holes Dispenser Relation.asset.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle C/Easy/Dispenser Easy.asset b/Assets/Desert/Assets/Modules/Holes Puzzle/Holes Dispenser.asset similarity index 96% rename from Assets/Desert/Assets/Modules/Puzzle C/Easy/Dispenser Easy.asset rename to Assets/Desert/Assets/Modules/Holes Puzzle/Holes Dispenser.asset index 5b976ad..a42d561 100644 --- a/Assets/Desert/Assets/Modules/Puzzle C/Easy/Dispenser Easy.asset +++ b/Assets/Desert/Assets/Modules/Holes Puzzle/Holes Dispenser.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: abf4a405f6c64073995bded39977563e, type: 3} - m_Name: Dispenser Easy + m_Name: Holes Dispenser m_EditorClassIdentifier: types: 03000000 modulePrefab: {fileID: 8291735269762471888, guid: 8253a7c07eeea3b48832a42b847cf0f1, diff --git a/Assets/Desert/Assets/Modules/Puzzle C/Easy/Dispenser Easy.asset.meta b/Assets/Desert/Assets/Modules/Holes Puzzle/Holes Dispenser.asset.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle C/Easy/Dispenser Easy.asset.meta rename to Assets/Desert/Assets/Modules/Holes Puzzle/Holes Dispenser.asset.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle C/Easy/Puzzle C Easy Dispenser.prefab b/Assets/Desert/Assets/Modules/Holes Puzzle/Holes Dispenser.prefab similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle C/Easy/Puzzle C Easy Dispenser.prefab rename to Assets/Desert/Assets/Modules/Holes Puzzle/Holes Dispenser.prefab diff --git a/Assets/Desert/Assets/Modules/Puzzle C/Easy/Puzzle C Easy Dispenser.prefab.meta b/Assets/Desert/Assets/Modules/Holes Puzzle/Holes Dispenser.prefab.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle C/Easy/Puzzle C Easy Dispenser.prefab.meta rename to Assets/Desert/Assets/Modules/Holes Puzzle/Holes Dispenser.prefab.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle C/Easy/Puzzle C Easy.asset b/Assets/Desert/Assets/Modules/Holes Puzzle/Holes.asset similarity index 92% rename from Assets/Desert/Assets/Modules/Puzzle C/Easy/Puzzle C Easy.asset rename to Assets/Desert/Assets/Modules/Holes Puzzle/Holes.asset index 32ab28a..0bd7f29 100644 --- a/Assets/Desert/Assets/Modules/Puzzle C/Easy/Puzzle C Easy.asset +++ b/Assets/Desert/Assets/Modules/Holes Puzzle/Holes.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f928b97941e3469a9015316bb5ac1309, type: 3} - m_Name: Puzzle C Easy + m_Name: Holes m_EditorClassIdentifier: types: 02000000 modulePrefab: {fileID: 2736082226738519698, guid: 435cdab79ab05ef43b4a387004dc04b5, @@ -19,3 +19,5 @@ MonoBehaviour: - {fileID: 11400000, guid: 8726392eac730a54f9235b4f53430ecd, type: 2} placementRequirements: - {fileID: 11400000, guid: 43eb2a566a244964aa3a3319eaafe1a8, type: 2} + puzzleName: Holes + puzzleVersion: 1 diff --git a/Assets/Desert/Assets/Modules/Puzzle C/Easy/Puzzle C Easy.asset.meta b/Assets/Desert/Assets/Modules/Holes Puzzle/Holes.asset.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle C/Easy/Puzzle C Easy.asset.meta rename to Assets/Desert/Assets/Modules/Holes Puzzle/Holes.asset.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle C/Holes.prefab b/Assets/Desert/Assets/Modules/Holes Puzzle/Holes.prefab similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle C/Holes.prefab rename to Assets/Desert/Assets/Modules/Holes Puzzle/Holes.prefab diff --git a/Assets/Desert/Assets/Modules/Puzzle C/Holes.prefab.meta b/Assets/Desert/Assets/Modules/Holes Puzzle/Holes.prefab.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle C/Holes.prefab.meta rename to Assets/Desert/Assets/Modules/Holes Puzzle/Holes.prefab.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle D.meta b/Assets/Desert/Assets/Modules/Hoop Fling Puzzle.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle D.meta rename to Assets/Desert/Assets/Modules/Hoop Fling Puzzle.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle D/Easy/Puzzle D Easy.asset b/Assets/Desert/Assets/Modules/Hoop Fling Puzzle/Hoop Fling.asset similarity index 96% rename from Assets/Desert/Assets/Modules/Puzzle D/Easy/Puzzle D Easy.asset rename to Assets/Desert/Assets/Modules/Hoop Fling Puzzle/Hoop Fling.asset index 222a166..0171a78 100644 --- a/Assets/Desert/Assets/Modules/Puzzle D/Easy/Puzzle D Easy.asset +++ b/Assets/Desert/Assets/Modules/Hoop Fling Puzzle/Hoop Fling.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f928b97941e3469a9015316bb5ac1309, type: 3} - m_Name: Puzzle D Easy + m_Name: Hoop Fling m_EditorClassIdentifier: types: 02000000 modulePrefab: {fileID: 6853723365353446933, guid: c6f4a21ce6c0ce84584c90804c96ad80, diff --git a/Assets/Desert/Assets/Modules/Puzzle D/Easy/Puzzle D Easy.asset.meta b/Assets/Desert/Assets/Modules/Hoop Fling Puzzle/Hoop Fling.asset.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle D/Easy/Puzzle D Easy.asset.meta rename to Assets/Desert/Assets/Modules/Hoop Fling Puzzle/Hoop Fling.asset.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle A.meta b/Assets/Desert/Assets/Modules/Position Order Puzzle.meta similarity index 77% rename from Assets/Desert/Assets/Modules/Puzzle A.meta rename to Assets/Desert/Assets/Modules/Position Order Puzzle.meta index f3ccca1..7cfb74c 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A.meta +++ b/Assets/Desert/Assets/Modules/Position Order Puzzle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c2433791727a49145b8152e0c4128c3f +guid: 983104a38693efd439457130b870aa33 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Medium/Ball Relation.asset b/Assets/Desert/Assets/Modules/Position Order Puzzle/Position Ball Relation.asset similarity index 93% rename from Assets/Desert/Assets/Modules/Puzzle A/Medium/Ball Relation.asset rename to Assets/Desert/Assets/Modules/Position Order Puzzle/Position Ball Relation.asset index 915fb19..5619b3b 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Medium/Ball Relation.asset +++ b/Assets/Desert/Assets/Modules/Position Order Puzzle/Position Ball Relation.asset @@ -10,6 +10,6 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6e3f3bf07aae4a03834a7943c255f37d, type: 3} - m_Name: Ball Relation + m_Name: Position Ball Relation m_EditorClassIdentifier: relatedModule: {fileID: 11400000, guid: f22d371376251c04da0c6da8d621356c, type: 2} diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Medium/Ball Relation.asset.meta b/Assets/Desert/Assets/Modules/Position Order Puzzle/Position Ball Relation.asset.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle A/Medium/Ball Relation.asset.meta rename to Assets/Desert/Assets/Modules/Position Order Puzzle/Position Ball Relation.asset.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Medium/Ball.asset b/Assets/Desert/Assets/Modules/Position Order Puzzle/Position Ball.asset similarity index 96% rename from Assets/Desert/Assets/Modules/Puzzle A/Medium/Ball.asset rename to Assets/Desert/Assets/Modules/Position Order Puzzle/Position Ball.asset index bdf2e96..93c13b8 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Medium/Ball.asset +++ b/Assets/Desert/Assets/Modules/Position Order Puzzle/Position Ball.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: abf4a405f6c64073995bded39977563e, type: 3} - m_Name: Ball + m_Name: Position Ball m_EditorClassIdentifier: types: 03000000 modulePrefab: {fileID: 8532410986149820624, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Medium/Ball.asset.meta b/Assets/Desert/Assets/Modules/Position Order Puzzle/Position Ball.asset.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle A/Medium/Ball.asset.meta rename to Assets/Desert/Assets/Modules/Position Order Puzzle/Position Ball.asset.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Medium/Ball.prefab b/Assets/Desert/Assets/Modules/Position Order Puzzle/Position Ball.prefab similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle A/Medium/Ball.prefab rename to Assets/Desert/Assets/Modules/Position Order Puzzle/Position Ball.prefab diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Medium/Ball.prefab.meta b/Assets/Desert/Assets/Modules/Position Order Puzzle/Position Ball.prefab.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle A/Medium/Ball.prefab.meta rename to Assets/Desert/Assets/Modules/Position Order Puzzle/Position Ball.prefab.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Medium/Puzzle A Medium.asset b/Assets/Desert/Assets/Modules/Position Order Puzzle/Position Order.asset similarity index 91% rename from Assets/Desert/Assets/Modules/Puzzle A/Medium/Puzzle A Medium.asset rename to Assets/Desert/Assets/Modules/Position Order Puzzle/Position Order.asset index 5f8e9a0..336a019 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Medium/Puzzle A Medium.asset +++ b/Assets/Desert/Assets/Modules/Position Order Puzzle/Position Order.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f928b97941e3469a9015316bb5ac1309, type: 3} - m_Name: Puzzle A Medium + m_Name: Position Order m_EditorClassIdentifier: types: 02000000 modulePrefab: {fileID: 5480458432365400828, guid: c83416abc9544024db244093f8c800dd, @@ -21,3 +21,5 @@ MonoBehaviour: - {fileID: 11400000, guid: 43eb2a566a244964aa3a3319eaafe1a8, type: 2} - {fileID: 11400000, guid: ed4830127e9381245a6af07e42c52422, type: 2} - {fileID: 11400000, guid: 1f1825b71bae09c438a1cb52603347d6, type: 2} + puzzleName: Position Order + puzzleVersion: 1 diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Medium/Puzzle A Medium.asset.meta b/Assets/Desert/Assets/Modules/Position Order Puzzle/Position Order.asset.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle A/Medium/Puzzle A Medium.asset.meta rename to Assets/Desert/Assets/Modules/Position Order Puzzle/Position Order.asset.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Medium/Terminal.prefab b/Assets/Desert/Assets/Modules/Position Order Puzzle/Terminal.prefab similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle A/Medium/Terminal.prefab rename to Assets/Desert/Assets/Modules/Position Order Puzzle/Terminal.prefab diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Medium/Terminal.prefab.meta b/Assets/Desert/Assets/Modules/Position Order Puzzle/Terminal.prefab.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle A/Medium/Terminal.prefab.meta rename to Assets/Desert/Assets/Modules/Position Order Puzzle/Terminal.prefab.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Medium.meta b/Assets/Desert/Assets/Modules/Puzzle A/Medium.meta deleted file mode 100644 index 664bf14..0000000 --- a/Assets/Desert/Assets/Modules/Puzzle A/Medium.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7ae224a79e61ac24fb314d0743fab9dc -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle C/Easy.meta b/Assets/Desert/Assets/Modules/Puzzle C/Easy.meta deleted file mode 100644 index 9f416a9..0000000 --- a/Assets/Desert/Assets/Modules/Puzzle C/Easy.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 33e0828b36e34c64498c37abb00bbc19 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle D/Easy.meta b/Assets/Desert/Assets/Modules/Puzzle D/Easy.meta deleted file mode 100644 index 8c52e78..0000000 --- a/Assets/Desert/Assets/Modules/Puzzle D/Easy.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c0b6cc57235be04428908f37c5c33f3c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Easy.meta b/Assets/Desert/Assets/Modules/Symbol Order Puzzle.meta similarity index 77% rename from Assets/Desert/Assets/Modules/Puzzle A/Easy.meta rename to Assets/Desert/Assets/Modules/Symbol Order Puzzle.meta index 38b134b..b840759 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Easy.meta +++ b/Assets/Desert/Assets/Modules/Symbol Order Puzzle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ceb526f9b2f89ac48bc6c98e6604b08b +guid: 2c26ade15cc19b04c9c62d3b6bd88dbd folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Easy/Ball Relation.asset b/Assets/Desert/Assets/Modules/Symbol Order Puzzle/Symbol Ball Relation.asset similarity index 93% rename from Assets/Desert/Assets/Modules/Puzzle A/Easy/Ball Relation.asset rename to Assets/Desert/Assets/Modules/Symbol Order Puzzle/Symbol Ball Relation.asset index 44a1343..79e8664 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Easy/Ball Relation.asset +++ b/Assets/Desert/Assets/Modules/Symbol Order Puzzle/Symbol Ball Relation.asset @@ -10,6 +10,6 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6e3f3bf07aae4a03834a7943c255f37d, type: 3} - m_Name: Ball Relation + m_Name: Symbol Ball Relation m_EditorClassIdentifier: relatedModule: {fileID: 11400000, guid: 13174855ef6a14a47b47933e9ebbf192, type: 2} diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Easy/Ball Relation.asset.meta b/Assets/Desert/Assets/Modules/Symbol Order Puzzle/Symbol Ball Relation.asset.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle A/Easy/Ball Relation.asset.meta rename to Assets/Desert/Assets/Modules/Symbol Order Puzzle/Symbol Ball Relation.asset.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Easy/Ball.asset b/Assets/Desert/Assets/Modules/Symbol Order Puzzle/Symbol Ball.asset similarity index 97% rename from Assets/Desert/Assets/Modules/Puzzle A/Easy/Ball.asset rename to Assets/Desert/Assets/Modules/Symbol Order Puzzle/Symbol Ball.asset index 5f697e4..ff440ff 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Easy/Ball.asset +++ b/Assets/Desert/Assets/Modules/Symbol Order Puzzle/Symbol Ball.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: abf4a405f6c64073995bded39977563e, type: 3} - m_Name: Ball + m_Name: Symbol Ball m_EditorClassIdentifier: types: 03000000 modulePrefab: {fileID: 8532410986149820624, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Easy/Ball.asset.meta b/Assets/Desert/Assets/Modules/Symbol Order Puzzle/Symbol Ball.asset.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle A/Easy/Ball.asset.meta rename to Assets/Desert/Assets/Modules/Symbol Order Puzzle/Symbol Ball.asset.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Easy/Ball.prefab b/Assets/Desert/Assets/Modules/Symbol Order Puzzle/Symbol Ball.prefab similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle A/Easy/Ball.prefab rename to Assets/Desert/Assets/Modules/Symbol Order Puzzle/Symbol Ball.prefab diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Easy/Ball.prefab.meta b/Assets/Desert/Assets/Modules/Symbol Order Puzzle/Symbol Ball.prefab.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle A/Easy/Ball.prefab.meta rename to Assets/Desert/Assets/Modules/Symbol Order Puzzle/Symbol Ball.prefab.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Easy/Puzzle A Easy.asset b/Assets/Desert/Assets/Modules/Symbol Order Puzzle/Symbol Order.asset similarity index 92% rename from Assets/Desert/Assets/Modules/Puzzle A/Easy/Puzzle A Easy.asset rename to Assets/Desert/Assets/Modules/Symbol Order Puzzle/Symbol Order.asset index afbb830..619cb25 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Easy/Puzzle A Easy.asset +++ b/Assets/Desert/Assets/Modules/Symbol Order Puzzle/Symbol Order.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f928b97941e3469a9015316bb5ac1309, type: 3} - m_Name: Puzzle A Easy + m_Name: Symbol Order m_EditorClassIdentifier: types: 02000000 modulePrefab: {fileID: 5480458432365400828, guid: 4b1cba03201b02345916ed8d217027f2, @@ -21,3 +21,5 @@ MonoBehaviour: - {fileID: 11400000, guid: 43eb2a566a244964aa3a3319eaafe1a8, type: 2} - {fileID: 11400000, guid: ed4830127e9381245a6af07e42c52422, type: 2} - {fileID: 11400000, guid: 1f1825b71bae09c438a1cb52603347d6, type: 2} + puzzleName: Symbol Order + puzzleVersion: 1 diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Easy/Puzzle A Easy.asset.meta b/Assets/Desert/Assets/Modules/Symbol Order Puzzle/Symbol Order.asset.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle A/Easy/Puzzle A Easy.asset.meta rename to Assets/Desert/Assets/Modules/Symbol Order Puzzle/Symbol Order.asset.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Easy/Terminal.prefab b/Assets/Desert/Assets/Modules/Symbol Order Puzzle/Terminal.prefab similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle A/Easy/Terminal.prefab rename to Assets/Desert/Assets/Modules/Symbol Order Puzzle/Terminal.prefab diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Easy/Terminal.prefab.meta b/Assets/Desert/Assets/Modules/Symbol Order Puzzle/Terminal.prefab.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle A/Easy/Terminal.prefab.meta rename to Assets/Desert/Assets/Modules/Symbol Order Puzzle/Terminal.prefab.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle D/Easy/Dispenser Easy Relation.asset b/Assets/Desert/Assets/Prefabs/Dispenser/Dispenser Relation.asset similarity index 93% rename from Assets/Desert/Assets/Modules/Puzzle D/Easy/Dispenser Easy Relation.asset rename to Assets/Desert/Assets/Prefabs/Dispenser/Dispenser Relation.asset index abbfdbe..7ac98fa 100644 --- a/Assets/Desert/Assets/Modules/Puzzle D/Easy/Dispenser Easy Relation.asset +++ b/Assets/Desert/Assets/Prefabs/Dispenser/Dispenser Relation.asset @@ -10,6 +10,6 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6e3f3bf07aae4a03834a7943c255f37d, type: 3} - m_Name: Dispenser Easy Relation + m_Name: Dispenser Relation m_EditorClassIdentifier: relatedModule: {fileID: 11400000, guid: 2ae9786d52faa1f4c82b3a3eeae9f538, type: 2} diff --git a/Assets/Desert/Assets/Modules/Puzzle D/Easy/Dispenser Easy Relation.asset.meta b/Assets/Desert/Assets/Prefabs/Dispenser/Dispenser Relation.asset.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle D/Easy/Dispenser Easy Relation.asset.meta rename to Assets/Desert/Assets/Prefabs/Dispenser/Dispenser Relation.asset.meta diff --git a/Assets/Desert/Assets/Modules/Puzzle D/Easy/Dispenser Easy.asset b/Assets/Desert/Assets/Prefabs/Dispenser/Dispenser.asset similarity index 96% rename from Assets/Desert/Assets/Modules/Puzzle D/Easy/Dispenser Easy.asset rename to Assets/Desert/Assets/Prefabs/Dispenser/Dispenser.asset index d19a254..c3b467d 100644 --- a/Assets/Desert/Assets/Modules/Puzzle D/Easy/Dispenser Easy.asset +++ b/Assets/Desert/Assets/Prefabs/Dispenser/Dispenser.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: abf4a405f6c64073995bded39977563e, type: 3} - m_Name: Dispenser Easy + m_Name: Dispenser m_EditorClassIdentifier: types: 03000000 modulePrefab: {fileID: 3942114796521670514, guid: 20c9cfab710bbe04ca6f81d44a01b025, diff --git a/Assets/Desert/Assets/Modules/Puzzle D/Easy/Dispenser Easy.asset.meta b/Assets/Desert/Assets/Prefabs/Dispenser/Dispenser.asset.meta similarity index 100% rename from Assets/Desert/Assets/Modules/Puzzle D/Easy/Dispenser Easy.asset.meta rename to Assets/Desert/Assets/Prefabs/Dispenser/Dispenser.asset.meta diff --git a/Assets/Engine/Runtime/Measurements.meta b/Assets/Engine/Runtime/Measurements.meta new file mode 100644 index 0000000..eaab4b2 --- /dev/null +++ b/Assets/Engine/Runtime/Measurements.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6d89990cf25d40c986a0ec0ff8050ceb +timeCreated: 1670694846 \ No newline at end of file diff --git a/Assets/Engine/Runtime/Measurements/Measure.cs b/Assets/Engine/Runtime/Measurements/Measure.cs new file mode 100644 index 0000000..4b36ef6 --- /dev/null +++ b/Assets/Engine/Runtime/Measurements/Measure.cs @@ -0,0 +1,7 @@ +namespace EscapeRoomEngine.Engine.Runtime.Measurements +{ + public class Measure + { + + } +} \ No newline at end of file diff --git a/Assets/Engine/Runtime/Measurements/Measure.cs.meta b/Assets/Engine/Runtime/Measurements/Measure.cs.meta new file mode 100644 index 0000000..1819866 --- /dev/null +++ b/Assets/Engine/Runtime/Measurements/Measure.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 9a9d36964fc24f59aab5bd5804aea3b1 +timeCreated: 1670695073 \ No newline at end of file diff --git a/Assets/Engine/Runtime/Measurements/PuzzleMeasurements.cs b/Assets/Engine/Runtime/Measurements/PuzzleMeasurements.cs new file mode 100644 index 0000000..af1b9bb --- /dev/null +++ b/Assets/Engine/Runtime/Measurements/PuzzleMeasurements.cs @@ -0,0 +1,7 @@ +namespace EscapeRoomEngine.Engine.Runtime.Measurements +{ + public struct PuzzleMeasurements + { + + } +} \ No newline at end of file diff --git a/Assets/Engine/Runtime/Measurements/PuzzleMeasurements.cs.meta b/Assets/Engine/Runtime/Measurements/PuzzleMeasurements.cs.meta new file mode 100644 index 0000000..e207064 --- /dev/null +++ b/Assets/Engine/Runtime/Measurements/PuzzleMeasurements.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e6d831555dc34776b8212a9d9de33414 +timeCreated: 1670695633 \ No newline at end of file diff --git a/Assets/Engine/Runtime/Modules/PuzzleModuleDescription.cs b/Assets/Engine/Runtime/Modules/PuzzleModuleDescription.cs index 41946b6..8641577 100644 --- a/Assets/Engine/Runtime/Modules/PuzzleModuleDescription.cs +++ b/Assets/Engine/Runtime/Modules/PuzzleModuleDescription.cs @@ -1,9 +1,13 @@ -using UnityEngine; +using NaughtyAttributes; +using UnityEngine; namespace EscapeRoomEngine.Engine.Runtime.Modules { [CreateAssetMenu(menuName = "Modules/Puzzle")] public class PuzzleModuleDescription : ModuleDescription { + public string puzzleName; + [InfoBox("Puzzle measurements will only be combined for the same puzzle with the same version. If large changes are made to the puzzle that might influence its measurements, the version should be incremented.")] + public int puzzleVersion = 1; } } \ No newline at end of file