diff --git a/Binaries/Win64/UnrealEditor-GraffModule-0001.dll b/Binaries/Win64/UnrealEditor-GraffModule-0001.dll new file mode 100644 index 0000000..25d89a7 Binary files /dev/null and b/Binaries/Win64/UnrealEditor-GraffModule-0001.dll differ diff --git a/Binaries/Win64/UnrealEditor-GraffModule.pdb b/Binaries/Win64/UnrealEditor-GraffModule-0001.pdb similarity index 83% rename from Binaries/Win64/UnrealEditor-GraffModule.pdb rename to Binaries/Win64/UnrealEditor-GraffModule-0001.pdb index 2fb1401..ed29349 100644 Binary files a/Binaries/Win64/UnrealEditor-GraffModule.pdb and b/Binaries/Win64/UnrealEditor-GraffModule-0001.pdb differ diff --git a/Binaries/Win64/UnrealEditor-GraffModule.dll b/Binaries/Win64/UnrealEditor-GraffModule.dll deleted file mode 100644 index 783ccb1..0000000 Binary files a/Binaries/Win64/UnrealEditor-GraffModule.dll and /dev/null differ diff --git a/Binaries/Win64/UnrealEditor-blueprintLibrary.dll b/Binaries/Win64/UnrealEditor-blueprintLibrary-0001.dll similarity index 86% rename from Binaries/Win64/UnrealEditor-blueprintLibrary.dll rename to Binaries/Win64/UnrealEditor-blueprintLibrary-0001.dll index 400deeb..7c8ef25 100644 Binary files a/Binaries/Win64/UnrealEditor-blueprintLibrary.dll and b/Binaries/Win64/UnrealEditor-blueprintLibrary-0001.dll differ diff --git a/Binaries/Win64/UnrealEditor-blueprintLibrary.pdb b/Binaries/Win64/UnrealEditor-blueprintLibrary-0001.pdb similarity index 94% rename from Binaries/Win64/UnrealEditor-blueprintLibrary.pdb rename to Binaries/Win64/UnrealEditor-blueprintLibrary-0001.pdb index 36e0204..6b0ef0e 100644 Binary files a/Binaries/Win64/UnrealEditor-blueprintLibrary.pdb and b/Binaries/Win64/UnrealEditor-blueprintLibrary-0001.pdb differ diff --git a/Binaries/Win64/UnrealEditor.modules b/Binaries/Win64/UnrealEditor.modules index 8330aab..b753fa1 100644 --- a/Binaries/Win64/UnrealEditor.modules +++ b/Binaries/Win64/UnrealEditor.modules @@ -2,7 +2,7 @@ "BuildId": "27405482", "Modules": { - "GraffModule": "UnrealEditor-GraffModule.dll", - "blueprintLibrary": "UnrealEditor-blueprintLibrary.dll" + "GraffModule": "UnrealEditor-GraffModule-0001.dll", + "blueprintLibrary": "UnrealEditor-blueprintLibrary-0001.dll" } } \ No newline at end of file diff --git a/Content/Blueprints/Data/MathAndConvertFns.uasset b/Content/Blueprints/Data/MathAndConvertFns.uasset index ac5d972..c1e45b3 100644 Binary files a/Content/Blueprints/Data/MathAndConvertFns.uasset and b/Content/Blueprints/Data/MathAndConvertFns.uasset differ diff --git a/Content/Blueprints/Data/flatData.uasset b/Content/Blueprints/Data/flatData.uasset index a21038d..ca9f95e 100644 Binary files a/Content/Blueprints/Data/flatData.uasset and b/Content/Blueprints/Data/flatData.uasset differ diff --git a/Content/Blueprints/Data/getTexts.uasset b/Content/Blueprints/Data/getTexts.uasset index 27ec4b6..7633abe 100644 Binary files a/Content/Blueprints/Data/getTexts.uasset and b/Content/Blueprints/Data/getTexts.uasset differ diff --git a/Content/Blueprints/Data/roomNames.uasset b/Content/Blueprints/Data/roomNames.uasset index 905cf0b..32be91f 100644 Binary files a/Content/Blueprints/Data/roomNames.uasset and b/Content/Blueprints/Data/roomNames.uasset differ diff --git a/Content/Blueprints/Lamp/BP_InteriorLamp.uasset b/Content/Blueprints/Lamp/BP_InteriorLamp.uasset index 15a98c8..98a7349 100644 Binary files a/Content/Blueprints/Lamp/BP_InteriorLamp.uasset and b/Content/Blueprints/Lamp/BP_InteriorLamp.uasset differ diff --git a/Content/Blueprints/Lamp/BP_InteriorLamp_Switch.uasset b/Content/Blueprints/Lamp/BP_InteriorLamp_Switch.uasset deleted file mode 100644 index a17795d..0000000 Binary files a/Content/Blueprints/Lamp/BP_InteriorLamp_Switch.uasset and /dev/null differ diff --git a/Content/Blueprints/Lamp/BP_MAF_FlashRoadSingleLamp.uasset b/Content/Blueprints/Lamp/BP_MAF_FlashRoadSingleLamp.uasset deleted file mode 100644 index 37bef2a..0000000 Binary files a/Content/Blueprints/Lamp/BP_MAF_FlashRoadSingleLamp.uasset and /dev/null differ diff --git a/Content/Blueprints/Lamp/BP_streetLamp.uasset b/Content/Blueprints/Lamp/BP_streetLamp.uasset index a77436c..9617bfa 100644 Binary files a/Content/Blueprints/Lamp/BP_streetLamp.uasset and b/Content/Blueprints/Lamp/BP_streetLamp.uasset differ diff --git a/Content/Blueprints/Lamp/BP_streetLamp_1.uasset b/Content/Blueprints/Lamp/BP_streetLamp_1.uasset deleted file mode 100644 index aa6767d..0000000 Binary files a/Content/Blueprints/Lamp/BP_streetLamp_1.uasset and /dev/null differ diff --git a/Content/Blueprints/Lamp/BP_streetLamp_2.uasset b/Content/Blueprints/Lamp/BP_streetLamp_2.uasset deleted file mode 100644 index 5b36f17..0000000 Binary files a/Content/Blueprints/Lamp/BP_streetLamp_2.uasset and /dev/null differ diff --git a/Content/Blueprints/Lamp/BP_streetLamp_3.uasset b/Content/Blueprints/Lamp/BP_streetLamp_3.uasset deleted file mode 100644 index db75591..0000000 Binary files a/Content/Blueprints/Lamp/BP_streetLamp_3.uasset and /dev/null differ diff --git a/Content/Blueprints/Lamp/BP_streetLamp_4.uasset b/Content/Blueprints/Lamp/BP_streetLamp_4.uasset deleted file mode 100644 index b7982fd..0000000 Binary files a/Content/Blueprints/Lamp/BP_streetLamp_4.uasset and /dev/null differ diff --git a/Content/Blueprints/Lamp/BP_streetLamp_5.uasset b/Content/Blueprints/Lamp/BP_streetLamp_5.uasset deleted file mode 100644 index 8012afc..0000000 Binary files a/Content/Blueprints/Lamp/BP_streetLamp_5.uasset and /dev/null differ diff --git a/Content/Blueprints/Lamp/BP_streetLamp_6.uasset b/Content/Blueprints/Lamp/BP_streetLamp_6.uasset deleted file mode 100644 index bed5508..0000000 Binary files a/Content/Blueprints/Lamp/BP_streetLamp_6.uasset and /dev/null differ diff --git a/Content/Blueprints/Lamp/BP_streetLamp_7.uasset b/Content/Blueprints/Lamp/BP_streetLamp_7.uasset deleted file mode 100644 index 8319a00..0000000 Binary files a/Content/Blueprints/Lamp/BP_streetLamp_7.uasset and /dev/null differ diff --git a/Content/Blueprints/Lamp/BP_streetLamp_SOH_1.uasset b/Content/Blueprints/Lamp/BP_streetLamp_SOH_1.uasset deleted file mode 100644 index 5031218..0000000 Binary files a/Content/Blueprints/Lamp/BP_streetLamp_SOH_1.uasset and /dev/null differ diff --git a/Content/Blueprints/Lamp/Lamp_Interior/BP_Bedroom_Lamp_01.uasset b/Content/Blueprints/Lamp/Lamp_Interior/BP_Bedroom_Lamp_01.uasset deleted file mode 100644 index 8a9b463..0000000 Binary files a/Content/Blueprints/Lamp/Lamp_Interior/BP_Bedroom_Lamp_01.uasset and /dev/null differ diff --git a/Content/Blueprints/Lamp/Lamp_Interior/BP_Bedroom_Lamp_01_Mirror.uasset b/Content/Blueprints/Lamp/Lamp_Interior/BP_Bedroom_Lamp_01_Mirror.uasset deleted file mode 100644 index af16f8f..0000000 Binary files a/Content/Blueprints/Lamp/Lamp_Interior/BP_Bedroom_Lamp_01_Mirror.uasset and /dev/null differ diff --git a/Content/Blueprints/Lamp/Lamp_Interior/BP_Childish_lamp_1.uasset b/Content/Blueprints/Lamp/Lamp_Interior/BP_Childish_lamp_1.uasset deleted file mode 100644 index e13b487..0000000 Binary files a/Content/Blueprints/Lamp/Lamp_Interior/BP_Childish_lamp_1.uasset and /dev/null differ diff --git a/Content/Blueprints/Lamp/Lamp_Interior/BP_Interior_Lamp.uasset b/Content/Blueprints/Lamp/Lamp_Interior/BP_Interior_Lamp.uasset deleted file mode 100644 index b5adb83..0000000 Binary files a/Content/Blueprints/Lamp/Lamp_Interior/BP_Interior_Lamp.uasset and /dev/null differ diff --git a/Content/Blueprints/Lamp/Lamp_Interior/BP_LivingRoom_Lamp_02.uasset b/Content/Blueprints/Lamp/Lamp_Interior/BP_LivingRoom_Lamp_02.uasset deleted file mode 100644 index 0fba028..0000000 Binary files a/Content/Blueprints/Lamp/Lamp_Interior/BP_LivingRoom_Lamp_02.uasset and /dev/null differ diff --git a/Content/Blueprints/Lamp/Lamp_Interior/BP_LivingRoom_Lamp_03.uasset b/Content/Blueprints/Lamp/Lamp_Interior/BP_LivingRoom_Lamp_03.uasset deleted file mode 100644 index 51b772f..0000000 Binary files a/Content/Blueprints/Lamp/Lamp_Interior/BP_LivingRoom_Lamp_03.uasset and /dev/null differ diff --git a/Content/Blueprints/Lamp/Lamp_Interior/BP_LivingRoom_Lamp_04.uasset b/Content/Blueprints/Lamp/Lamp_Interior/BP_LivingRoom_Lamp_04.uasset deleted file mode 100644 index e80bbf3..0000000 Binary files a/Content/Blueprints/Lamp/Lamp_Interior/BP_LivingRoom_Lamp_04.uasset and /dev/null differ diff --git a/Content/Blueprints/Lamp/Lamp_Interior/BP_LivingRoom_Lamp_05.uasset b/Content/Blueprints/Lamp/Lamp_Interior/BP_LivingRoom_Lamp_05.uasset deleted file mode 100644 index 67e539b..0000000 Binary files a/Content/Blueprints/Lamp/Lamp_Interior/BP_LivingRoom_Lamp_05.uasset and /dev/null differ diff --git a/Content/Blueprints/Lamp/Lamp_Interior/BP_LivingRoom_Lamp_06.uasset b/Content/Blueprints/Lamp/Lamp_Interior/BP_LivingRoom_Lamp_06.uasset deleted file mode 100644 index b1a3af3..0000000 Binary files a/Content/Blueprints/Lamp/Lamp_Interior/BP_LivingRoom_Lamp_06.uasset and /dev/null differ diff --git a/Content/Blueprints/Lamp/Lamp_Interior/BP_MOP_Lamp_01.uasset b/Content/Blueprints/Lamp/Lamp_Interior/BP_MOP_Lamp_01.uasset deleted file mode 100644 index ebdb77b..0000000 Binary files a/Content/Blueprints/Lamp/Lamp_Interior/BP_MOP_Lamp_01.uasset and /dev/null differ diff --git a/Content/Blueprints/Player/CM.uasset b/Content/Blueprints/Player/CM.uasset index ce8f9b2..93be20d 100644 Binary files a/Content/Blueprints/Player/CM.uasset and b/Content/Blueprints/Player/CM.uasset differ diff --git a/Content/Blueprints/Player/GI.uasset b/Content/Blueprints/Player/GI.uasset index d437d2e..5e74220 100644 Binary files a/Content/Blueprints/Player/GI.uasset and b/Content/Blueprints/Player/GI.uasset differ diff --git a/Content/Blueprints/Player/GameplayFunctions.uasset b/Content/Blueprints/Player/GameplayFunctions.uasset index db043ac..de629c9 100644 Binary files a/Content/Blueprints/Player/GameplayFunctions.uasset and b/Content/Blueprints/Player/GameplayFunctions.uasset differ diff --git a/Content/Blueprints/Player/MoveSpline.uasset b/Content/Blueprints/Player/MoveSpline.uasset new file mode 100644 index 0000000..30d8290 Binary files /dev/null and b/Content/Blueprints/Player/MoveSpline.uasset differ diff --git a/Content/Blueprints/Player/MyPawn.uasset b/Content/Blueprints/Player/MyPawn.uasset index 7ee87a4..e2fa98c 100644 Binary files a/Content/Blueprints/Player/MyPawn.uasset and b/Content/Blueprints/Player/MyPawn.uasset differ diff --git a/Content/Blueprints/Player/WalkingPawn.uasset b/Content/Blueprints/Player/WalkingPawn.uasset index 0e6f0a4..be6303b 100644 Binary files a/Content/Blueprints/Player/WalkingPawn.uasset and b/Content/Blueprints/Player/WalkingPawn.uasset differ diff --git a/Content/Blueprints/Player/cameraSlowShake.uasset b/Content/Blueprints/Player/cameraSlowShake.uasset index 74f98d6..f546ec2 100644 Binary files a/Content/Blueprints/Player/cameraSlowShake.uasset and b/Content/Blueprints/Player/cameraSlowShake.uasset differ diff --git a/Content/Blueprints/Player/getFunctions.uasset b/Content/Blueprints/Player/getFunctions.uasset index 86cf419..a8e41d6 100644 Binary files a/Content/Blueprints/Player/getFunctions.uasset and b/Content/Blueprints/Player/getFunctions.uasset differ diff --git a/Content/Blueprints/Player/myGM.uasset b/Content/Blueprints/Player/myGM.uasset index 3b222b2..537d8ec 100644 Binary files a/Content/Blueprints/Player/myGM.uasset and b/Content/Blueprints/Player/myGM.uasset differ diff --git a/Content/Blueprints/UI/Actors/FlatPoint.uasset b/Content/Blueprints/UI/Actors/FlatPoint.uasset index 7053196..583cb6c 100644 Binary files a/Content/Blueprints/UI/Actors/FlatPoint.uasset and b/Content/Blueprints/UI/Actors/FlatPoint.uasset differ diff --git a/Content/Blueprints/UI/Actors/FloorPoint.uasset b/Content/Blueprints/UI/Actors/FloorPoint.uasset index 302d7e9..cd17736 100644 Binary files a/Content/Blueprints/UI/Actors/FloorPoint.uasset and b/Content/Blueprints/UI/Actors/FloorPoint.uasset differ diff --git a/Content/Blueprints/UI/Actors/HousePoint.uasset b/Content/Blueprints/UI/Actors/HousePoint.uasset index c7d7d3d..f9205a7 100644 Binary files a/Content/Blueprints/UI/Actors/HousePoint.uasset and b/Content/Blueprints/UI/Actors/HousePoint.uasset differ diff --git a/Content/Blueprints/UI/Actors/InfraPoint.uasset b/Content/Blueprints/UI/Actors/InfraPoint.uasset index 7cc4669..812aa01 100644 Binary files a/Content/Blueprints/UI/Actors/InfraPoint.uasset and b/Content/Blueprints/UI/Actors/InfraPoint.uasset differ diff --git a/Content/Blueprints/UI/Actors/KPmaker.uasset b/Content/Blueprints/UI/Actors/KPmaker.uasset index ee8dc59..2c776c4 100644 Binary files a/Content/Blueprints/UI/Actors/KPmaker.uasset and b/Content/Blueprints/UI/Actors/KPmaker.uasset differ diff --git a/Content/Blueprints/UI/Actors/flatCAP.uasset b/Content/Blueprints/UI/Actors/flatCAP.uasset index b2169e1..a625c70 100644 Binary files a/Content/Blueprints/UI/Actors/flatCAP.uasset and b/Content/Blueprints/UI/Actors/flatCAP.uasset differ diff --git a/Content/Blueprints/UI/Actors/infraCylinder.uasset b/Content/Blueprints/UI/Actors/infraCylinder.uasset index 6751335..22c91da 100644 Binary files a/Content/Blueprints/UI/Actors/infraCylinder.uasset and b/Content/Blueprints/UI/Actors/infraCylinder.uasset differ diff --git a/Content/Blueprints/UI/Actors/pointForDebil.uasset b/Content/Blueprints/UI/Actors/pointForDebil.uasset index faf8e52..3ea6343 100644 Binary files a/Content/Blueprints/UI/Actors/pointForDebil.uasset and b/Content/Blueprints/UI/Actors/pointForDebil.uasset differ diff --git a/Content/Blueprints/UI/Actors/walkPointer.uasset b/Content/Blueprints/UI/Actors/walkPointer.uasset index 7fc4bee..99afc7a 100644 Binary files a/Content/Blueprints/UI/Actors/walkPointer.uasset and b/Content/Blueprints/UI/Actors/walkPointer.uasset differ diff --git a/Content/Blueprints/UI/Materials/M_filterHIghlights.uasset b/Content/Blueprints/UI/Materials/M_filterHIghlights.uasset new file mode 100644 index 0000000..2fb729b Binary files /dev/null and b/Content/Blueprints/UI/Materials/M_filterHIghlights.uasset differ diff --git a/Content/Blueprints/UI/Widgets/DoorCard.uasset b/Content/Blueprints/UI/Widgets/DoorCard.uasset index 1d04f4a..ab5907c 100644 Binary files a/Content/Blueprints/UI/Widgets/DoorCard.uasset and b/Content/Blueprints/UI/Widgets/DoorCard.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/CardForHelp.uasset b/Content/Blueprints/UI/Widgets/Elements/CardForHelp.uasset index dc3ff73..62738f5 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/CardForHelp.uasset and b/Content/Blueprints/UI/Widgets/Elements/CardForHelp.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/Chbox.uasset b/Content/Blueprints/UI/Widgets/Elements/Chbox.uasset index 8ec31e1..6ff494b 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/Chbox.uasset and b/Content/Blueprints/UI/Widgets/Elements/Chbox.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/CompAss_Circle.uasset b/Content/Blueprints/UI/Widgets/Elements/CompAss_Circle.uasset index eec3865..9fda1f0 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/CompAss_Circle.uasset and b/Content/Blueprints/UI/Widgets/Elements/CompAss_Circle.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/ContForMenuBt.uasset b/Content/Blueprints/UI/Widgets/Elements/ContForMenuBt.uasset index c1dcf1b..176f813 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/ContForMenuBt.uasset and b/Content/Blueprints/UI/Widgets/Elements/ContForMenuBt.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/FlatForOffer.uasset b/Content/Blueprints/UI/Widgets/Elements/FlatForOffer.uasset index fe5ffe0..d8c6b35 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/FlatForOffer.uasset and b/Content/Blueprints/UI/Widgets/Elements/FlatForOffer.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/FlatMapMarker.uasset b/Content/Blueprints/UI/Widgets/Elements/FlatMapMarker.uasset index 6908490..dc047ca 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/FlatMapMarker.uasset and b/Content/Blueprints/UI/Widgets/Elements/FlatMapMarker.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/ImageAnim.uasset b/Content/Blueprints/UI/Widgets/Elements/ImageAnim.uasset index 127f681..4d37e8c 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/ImageAnim.uasset and b/Content/Blueprints/UI/Widgets/Elements/ImageAnim.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/Inputs.uasset b/Content/Blueprints/UI/Widgets/Elements/Inputs.uasset index c74f44d..35624c2 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/Inputs.uasset and b/Content/Blueprints/UI/Widgets/Elements/Inputs.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/KeyboardBtn.uasset b/Content/Blueprints/UI/Widgets/Elements/KeyboardBtn.uasset index 48b3892..807754f 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/KeyboardBtn.uasset and b/Content/Blueprints/UI/Widgets/Elements/KeyboardBtn.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/MenuBtn.uasset b/Content/Blueprints/UI/Widgets/Elements/MenuBtn.uasset index be7cba6..f7ce2e5 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/MenuBtn.uasset and b/Content/Blueprints/UI/Widgets/Elements/MenuBtn.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/MoveMap/mapMoving.uasset b/Content/Blueprints/UI/Widgets/Elements/MoveMap/mapMoving.uasset index 515fd29..a650423 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/MoveMap/mapMoving.uasset and b/Content/Blueprints/UI/Widgets/Elements/MoveMap/mapMoving.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/MoveMap/miniMap.uasset b/Content/Blueprints/UI/Widgets/Elements/MoveMap/miniMap.uasset index e2519fa..3eaa755 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/MoveMap/miniMap.uasset and b/Content/Blueprints/UI/Widgets/Elements/MoveMap/miniMap.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/PartnersCard.uasset b/Content/Blueprints/UI/Widgets/Elements/PartnersCard.uasset index 6d3a599..e359496 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/PartnersCard.uasset and b/Content/Blueprints/UI/Widgets/Elements/PartnersCard.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/PhotoSlider.uasset b/Content/Blueprints/UI/Widgets/Elements/PhotoSlider.uasset index 6fe0aaa..2108a32 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/PhotoSlider.uasset and b/Content/Blueprints/UI/Widgets/Elements/PhotoSlider.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/PhotoSliderAbout.uasset b/Content/Blueprints/UI/Widgets/Elements/PhotoSliderAbout.uasset new file mode 100644 index 0000000..b55554a Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Elements/PhotoSliderAbout.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/PhotoSliderAboutUs.uasset b/Content/Blueprints/UI/Widgets/Elements/PhotoSliderAboutUs.uasset index 2b6e512..d6a641b 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/PhotoSliderAboutUs.uasset and b/Content/Blueprints/UI/Widgets/Elements/PhotoSliderAboutUs.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/PhotoSlider_child.uasset b/Content/Blueprints/UI/Widgets/Elements/PhotoSlider_child.uasset index 5cfcc9b..7e79316 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/PhotoSlider_child.uasset and b/Content/Blueprints/UI/Widgets/Elements/PhotoSlider_child.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/ScrollBar.uasset b/Content/Blueprints/UI/Widgets/Elements/ScrollBar.uasset index 4446c0f..c8da102 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/ScrollBar.uasset and b/Content/Blueprints/UI/Widgets/Elements/ScrollBar.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/Selector/Selector.uasset b/Content/Blueprints/UI/Widgets/Elements/Selector/Selector.uasset index 64ad5ad..93e830d 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/Selector/Selector.uasset and b/Content/Blueprints/UI/Widgets/Elements/Selector/Selector.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/Selector/SelectorChild.uasset b/Content/Blueprints/UI/Widgets/Elements/Selector/SelectorChild.uasset index 63bcd91..2c5f9a3 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/Selector/SelectorChild.uasset and b/Content/Blueprints/UI/Widgets/Elements/Selector/SelectorChild.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/Sliders/DistanceSlider.uasset b/Content/Blueprints/UI/Widgets/Elements/Sliders/DistanceSlider.uasset index 8130338..0d46ba4 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/Sliders/DistanceSlider.uasset and b/Content/Blueprints/UI/Widgets/Elements/Sliders/DistanceSlider.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/Sliders/Slider.uasset b/Content/Blueprints/UI/Widgets/Elements/Sliders/Slider.uasset index 43eba41..4435a8a 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/Sliders/Slider.uasset and b/Content/Blueprints/UI/Widgets/Elements/Sliders/Slider.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/Sliders/SliderHandle.uasset b/Content/Blueprints/UI/Widgets/Elements/Sliders/SliderHandle.uasset index 92b19fe..004de8a 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/Sliders/SliderHandle.uasset and b/Content/Blueprints/UI/Widgets/Elements/Sliders/SliderHandle.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/Sliders/infiniteSlider.uasset b/Content/Blueprints/UI/Widgets/Elements/Sliders/infiniteSlider.uasset index 4119a3c..aab7381 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/Sliders/infiniteSlider.uasset and b/Content/Blueprints/UI/Widgets/Elements/Sliders/infiniteSlider.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/UTPListItem.uasset b/Content/Blueprints/UI/Widgets/Elements/UTPListItem.uasset new file mode 100644 index 0000000..a51f7b5 Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Elements/UTPListItem.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignCTA.uasset b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignCTA.uasset new file mode 100644 index 0000000..f05fd64 Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignCTA.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignFavorite.uasset b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignFavorite.uasset new file mode 100644 index 0000000..fa3d8e3 Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignFavorite.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignMain.uasset b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignMain.uasset new file mode 100644 index 0000000..6d26eb5 Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignMain.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignMainBlack.uasset b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignMainBlack.uasset new file mode 100644 index 0000000..7e1feaf Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignMainBlack.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignPrimary.uasset b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignPrimary.uasset new file mode 100644 index 0000000..72906e3 Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignPrimary.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignSecondary.uasset b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignSecondary.uasset new file mode 100644 index 0000000..6887fcf Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignSecondary.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignTertiaryType0.uasset b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignTertiaryType0.uasset new file mode 100644 index 0000000..52d1e75 Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignTertiaryType0.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignTertiaryType2.uasset b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignTertiaryType2.uasset new file mode 100644 index 0000000..ddb7b53 Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignTertiaryType2.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignTertiaryType3.uasset b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignTertiaryType3.uasset new file mode 100644 index 0000000..a7ba501 Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignTertiaryType3.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignToggle.uasset b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignToggle.uasset new file mode 100644 index 0000000..a5bad2e Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignToggle.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignToggleFloor.uasset b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignToggleFloor.uasset new file mode 100644 index 0000000..98aeba9 Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/DesignToggleFloor.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/buttonDesign/baseDesignMainWithFav.uasset b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/baseDesignMainWithFav.uasset new file mode 100644 index 0000000..6885d52 Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/baseDesignMainWithFav.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/buttonDesign/baseDesignTertiary.uasset b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/baseDesignTertiary.uasset new file mode 100644 index 0000000..8925424 Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/baseDesignTertiary.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/buttonDesign/baseDesignTertiaryType1.uasset b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/baseDesignTertiaryType1.uasset new file mode 100644 index 0000000..a6b45a8 Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/baseDesignTertiaryType1.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/buttonDesign/baseDesignToggle.uasset b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/baseDesignToggle.uasset new file mode 100644 index 0000000..d9a56e2 Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/baseDesignToggle.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/buttonDesign/baseDesignToggleSearch.uasset b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/baseDesignToggleSearch.uasset new file mode 100644 index 0000000..4e118e5 Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/baseDesignToggleSearch.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/buttonDesign/baseDesign_.uasset b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/baseDesign_.uasset new file mode 100644 index 0000000..5e01b79 Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Elements/buttonDesign/baseDesign_.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/locationMap.uasset b/Content/Blueprints/UI/Widgets/Elements/locationMap.uasset index 8beb40c..9765922 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/locationMap.uasset and b/Content/Blueprints/UI/Widgets/Elements/locationMap.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/naviMapImage.uasset b/Content/Blueprints/UI/Widgets/Elements/naviMapImage.uasset index 06f38e3..2b35ff1 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/naviMapImage.uasset and b/Content/Blueprints/UI/Widgets/Elements/naviMapImage.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/simpleBtn.uasset b/Content/Blueprints/UI/Widgets/Elements/simpleBtn.uasset index b1deca6..f9753bd 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/simpleBtn.uasset and b/Content/Blueprints/UI/Widgets/Elements/simpleBtn.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/styledText.uasset b/Content/Blueprints/UI/Widgets/Elements/styledText.uasset index 5ee4fd8..b0e4401 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/styledText.uasset and b/Content/Blueprints/UI/Widgets/Elements/styledText.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/switch.uasset b/Content/Blueprints/UI/Widgets/Elements/switch.uasset index a71d224..ab72b85 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/switch.uasset and b/Content/Blueprints/UI/Widgets/Elements/switch.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/tabs/DoubleTab.uasset b/Content/Blueprints/UI/Widgets/Elements/tabs/DoubleTab.uasset index 974ce5a..1943f38 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/tabs/DoubleTab.uasset and b/Content/Blueprints/UI/Widgets/Elements/tabs/DoubleTab.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/tabs/tabs.uasset b/Content/Blueprints/UI/Widgets/Elements/tabs/tabs.uasset index f8a30c1..d2f6d47 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/tabs/tabs.uasset and b/Content/Blueprints/UI/Widgets/Elements/tabs/tabs.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/tabs/tabsChild.uasset b/Content/Blueprints/UI/Widgets/Elements/tabs/tabsChild.uasset index c7e71f3..c8d4a32 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/tabs/tabsChild.uasset and b/Content/Blueprints/UI/Widgets/Elements/tabs/tabsChild.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/tabs/tabsChild_Decorate.uasset b/Content/Blueprints/UI/Widgets/Elements/tabs/tabsChild_Decorate.uasset index f3d37d2..56425ad 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/tabs/tabsChild_Decorate.uasset and b/Content/Blueprints/UI/Widgets/Elements/tabs/tabsChild_Decorate.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/tabs/tabs_Decorate.uasset b/Content/Blueprints/UI/Widgets/Elements/tabs/tabs_Decorate.uasset index 28171ab..9e58695 100644 Binary files a/Content/Blueprints/UI/Widgets/Elements/tabs/tabs_Decorate.uasset and b/Content/Blueprints/UI/Widgets/Elements/tabs/tabs_Decorate.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Elements/tet.uasset b/Content/Blueprints/UI/Widgets/Elements/tet.uasset new file mode 100644 index 0000000..7fa1215 Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Elements/tet.uasset differ diff --git a/Content/Blueprints/UI/Widgets/KPWidget.uasset b/Content/Blueprints/UI/Widgets/KPWidget.uasset index 05998dd..97f591f 100644 Binary files a/Content/Blueprints/UI/Widgets/KPWidget.uasset and b/Content/Blueprints/UI/Widgets/KPWidget.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Keyboard/keyboard.uasset b/Content/Blueprints/UI/Widgets/Keyboard/keyboard.uasset index 93240df..e4a82ba 100644 Binary files a/Content/Blueprints/UI/Widgets/Keyboard/keyboard.uasset and b/Content/Blueprints/UI/Widgets/Keyboard/keyboard.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Loading.uasset b/Content/Blueprints/UI/Widgets/Loading.uasset index 1c462a9..c6c3bab 100644 Binary files a/Content/Blueprints/UI/Widgets/Loading.uasset and b/Content/Blueprints/UI/Widgets/Loading.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Menu/About.uasset b/Content/Blueprints/UI/Widgets/Menu/About.uasset index bd08ff0..8a604c7 100644 Binary files a/Content/Blueprints/UI/Widgets/Menu/About.uasset and b/Content/Blueprints/UI/Widgets/Menu/About.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Menu/AboutUs.uasset b/Content/Blueprints/UI/Widgets/Menu/AboutUs.uasset index d568320..a86d615 100644 Binary files a/Content/Blueprints/UI/Widgets/Menu/AboutUs.uasset and b/Content/Blueprints/UI/Widgets/Menu/AboutUs.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Menu/Booking.uasset b/Content/Blueprints/UI/Widgets/Menu/Booking.uasset index 7886d20..ebd151f 100644 Binary files a/Content/Blueprints/UI/Widgets/Menu/Booking.uasset and b/Content/Blueprints/UI/Widgets/Menu/Booking.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Menu/DragFavCard/DragWidget.uasset b/Content/Blueprints/UI/Widgets/Menu/DragFavCard/DragWidget.uasset index 3240376..6f74f11 100644 Binary files a/Content/Blueprints/UI/Widgets/Menu/DragFavCard/DragWidget.uasset and b/Content/Blueprints/UI/Widgets/Menu/DragFavCard/DragWidget.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Menu/EmptyEndSession.uasset b/Content/Blueprints/UI/Widgets/Menu/EmptyEndSession.uasset index aa0e454..42afde4 100644 Binary files a/Content/Blueprints/UI/Widgets/Menu/EmptyEndSession.uasset and b/Content/Blueprints/UI/Widgets/Menu/EmptyEndSession.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Menu/EndSession.uasset b/Content/Blueprints/UI/Widgets/Menu/EndSession.uasset index 648ed5c..7888a71 100644 Binary files a/Content/Blueprints/UI/Widgets/Menu/EndSession.uasset and b/Content/Blueprints/UI/Widgets/Menu/EndSession.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Menu/FastTravel.uasset b/Content/Blueprints/UI/Widgets/Menu/FastTravel.uasset index 7c7ba11..e4aad0c 100644 Binary files a/Content/Blueprints/UI/Widgets/Menu/FastTravel.uasset and b/Content/Blueprints/UI/Widgets/Menu/FastTravel.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Menu/Favorite.uasset b/Content/Blueprints/UI/Widgets/Menu/Favorite.uasset index 316c132..31884f5 100644 Binary files a/Content/Blueprints/UI/Widgets/Menu/Favorite.uasset and b/Content/Blueprints/UI/Widgets/Menu/Favorite.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Menu/FavoriteCard.uasset b/Content/Blueprints/UI/Widgets/Menu/FavoriteCard.uasset index fa8344d..4f1e156 100644 Binary files a/Content/Blueprints/UI/Widgets/Menu/FavoriteCard.uasset and b/Content/Blueprints/UI/Widgets/Menu/FavoriteCard.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Menu/Goodby.uasset b/Content/Blueprints/UI/Widgets/Menu/Goodby.uasset index aa4cd54..532809d 100644 Binary files a/Content/Blueprints/UI/Widgets/Menu/Goodby.uasset and b/Content/Blueprints/UI/Widgets/Menu/Goodby.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Menu/Hello.uasset b/Content/Blueprints/UI/Widgets/Menu/Hello.uasset index 63bf4aa..aaaa105 100644 Binary files a/Content/Blueprints/UI/Widgets/Menu/Hello.uasset and b/Content/Blueprints/UI/Widgets/Menu/Hello.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Menu/Help.uasset b/Content/Blueprints/UI/Widgets/Menu/Help.uasset index 23205d9..d4db57a 100644 Binary files a/Content/Blueprints/UI/Widgets/Menu/Help.uasset and b/Content/Blueprints/UI/Widgets/Menu/Help.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Menu/Layout.uasset b/Content/Blueprints/UI/Widgets/Menu/Layout.uasset index 0ee851d..139cb25 100644 Binary files a/Content/Blueprints/UI/Widgets/Menu/Layout.uasset and b/Content/Blueprints/UI/Widgets/Menu/Layout.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Menu/Login.uasset b/Content/Blueprints/UI/Widgets/Menu/Login.uasset index 1f8a4a0..49fb1dd 100644 Binary files a/Content/Blueprints/UI/Widgets/Menu/Login.uasset and b/Content/Blueprints/UI/Widgets/Menu/Login.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Menu/Partners.uasset b/Content/Blueprints/UI/Widgets/Menu/Partners.uasset index 9615184..7b86bee 100644 Binary files a/Content/Blueprints/UI/Widgets/Menu/Partners.uasset and b/Content/Blueprints/UI/Widgets/Menu/Partners.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Menu/Settings.uasset b/Content/Blueprints/UI/Widgets/Menu/Settings.uasset index c80c776..cfd6ced 100644 Binary files a/Content/Blueprints/UI/Widgets/Menu/Settings.uasset and b/Content/Blueprints/UI/Widgets/Menu/Settings.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Menu/mainMenu.uasset b/Content/Blueprints/UI/Widgets/Menu/mainMenu.uasset index 6889c3c..2717fbd 100644 Binary files a/Content/Blueprints/UI/Widgets/Menu/mainMenu.uasset and b/Content/Blueprints/UI/Widgets/Menu/mainMenu.uasset differ diff --git a/Content/Blueprints/UI/Widgets/NewWidgetBlueprint.uasset b/Content/Blueprints/UI/Widgets/NewWidgetBlueprint.uasset new file mode 100644 index 0000000..ff06d81 Binary files /dev/null and b/Content/Blueprints/UI/Widgets/NewWidgetBlueprint.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Point/Marker.uasset b/Content/Blueprints/UI/Widgets/Point/Marker.uasset index ec8fcc1..312493f 100644 Binary files a/Content/Blueprints/UI/Widgets/Point/Marker.uasset and b/Content/Blueprints/UI/Widgets/Point/Marker.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Point/NumberTransport.uasset b/Content/Blueprints/UI/Widgets/Point/NumberTransport.uasset index 0f02126..f0e2b61 100644 Binary files a/Content/Blueprints/UI/Widgets/Point/NumberTransport.uasset and b/Content/Blueprints/UI/Widgets/Point/NumberTransport.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Point/Point_FD.uasset b/Content/Blueprints/UI/Widgets/Point/Point_FD.uasset index 52fd8ab..096f5b5 100644 Binary files a/Content/Blueprints/UI/Widgets/Point/Point_FD.uasset and b/Content/Blueprints/UI/Widgets/Point/Point_FD.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Point/Point_Infra_3d.uasset b/Content/Blueprints/UI/Widgets/Point/Point_Infra_3d.uasset index c210517..fc6cd2e 100644 Binary files a/Content/Blueprints/UI/Widgets/Point/Point_Infra_3d.uasset and b/Content/Blueprints/UI/Widgets/Point/Point_Infra_3d.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Point/Point_Room.uasset b/Content/Blueprints/UI/Widgets/Point/Point_Room.uasset index e5a612c..9e81487 100644 Binary files a/Content/Blueprints/UI/Widgets/Point/Point_Room.uasset and b/Content/Blueprints/UI/Widgets/Point/Point_Room.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Search/BigSearchCard.uasset b/Content/Blueprints/UI/Widgets/Search/BigSearchCard.uasset index 63d3549..b66263f 100644 Binary files a/Content/Blueprints/UI/Widgets/Search/BigSearchCard.uasset and b/Content/Blueprints/UI/Widgets/Search/BigSearchCard.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Search/Search.uasset b/Content/Blueprints/UI/Widgets/Search/Search.uasset index 1eeb141..eddfc88 100644 Binary files a/Content/Blueprints/UI/Widgets/Search/Search.uasset and b/Content/Blueprints/UI/Widgets/Search/Search.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Search/SearchV2.uasset b/Content/Blueprints/UI/Widgets/Search/SearchV2.uasset new file mode 100644 index 0000000..a1639b8 Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Search/SearchV2.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Search/SmallSearchCard.uasset b/Content/Blueprints/UI/Widgets/Search/SmallSearchCard.uasset index 7cf7de1..479666c 100644 Binary files a/Content/Blueprints/UI/Widgets/Search/SmallSearchCard.uasset and b/Content/Blueprints/UI/Widgets/Search/SmallSearchCard.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Search/SmallSearchCardV2.uasset b/Content/Blueprints/UI/Widgets/Search/SmallSearchCardV2.uasset new file mode 100644 index 0000000..07cdd07 Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Search/SmallSearchCardV2.uasset differ diff --git a/Content/Blueprints/UI/Widgets/Search/variantLineV2.uasset b/Content/Blueprints/UI/Widgets/Search/variantLineV2.uasset new file mode 100644 index 0000000..766c88c Binary files /dev/null and b/Content/Blueprints/UI/Widgets/Search/variantLineV2.uasset differ diff --git a/Content/Blueprints/UI/Widgets/SubMenu/Autopresentation.uasset b/Content/Blueprints/UI/Widgets/SubMenu/Autopresentation.uasset index 18848c1..7c3166b 100644 Binary files a/Content/Blueprints/UI/Widgets/SubMenu/Autopresentation.uasset and b/Content/Blueprints/UI/Widgets/SubMenu/Autopresentation.uasset differ diff --git a/Content/Blueprints/UI/Widgets/SubMenu/DayNight.uasset b/Content/Blueprints/UI/Widgets/SubMenu/DayNight.uasset index 9752f67..95af0cf 100644 Binary files a/Content/Blueprints/UI/Widgets/SubMenu/DayNight.uasset and b/Content/Blueprints/UI/Widgets/SubMenu/DayNight.uasset differ diff --git a/Content/Blueprints/UI/Widgets/SubMenu/Header.uasset b/Content/Blueprints/UI/Widgets/SubMenu/Header.uasset index d5f4d27..5b052b7 100644 Binary files a/Content/Blueprints/UI/Widgets/SubMenu/Header.uasset and b/Content/Blueprints/UI/Widgets/SubMenu/Header.uasset differ diff --git a/Content/Blueprints/UI/Widgets/SubMenu/Infrastrucrure.uasset b/Content/Blueprints/UI/Widgets/SubMenu/Infrastrucrure.uasset index 080f1e7..eada960 100644 Binary files a/Content/Blueprints/UI/Widgets/SubMenu/Infrastrucrure.uasset and b/Content/Blueprints/UI/Widgets/SubMenu/Infrastrucrure.uasset differ diff --git a/Content/Blueprints/UI/Widgets/SubMenu/NavMenu.uasset b/Content/Blueprints/UI/Widgets/SubMenu/NavMenu.uasset index 215c0da..d7612d1 100644 Binary files a/Content/Blueprints/UI/Widgets/SubMenu/NavMenu.uasset and b/Content/Blueprints/UI/Widgets/SubMenu/NavMenu.uasset differ diff --git a/Content/Blueprints/UI/Widgets/SubMenu/Notifications.uasset b/Content/Blueprints/UI/Widgets/SubMenu/Notifications.uasset index 4a1705f..b2a0469 100644 Binary files a/Content/Blueprints/UI/Widgets/SubMenu/Notifications.uasset and b/Content/Blueprints/UI/Widgets/SubMenu/Notifications.uasset differ diff --git a/Content/Blueprints/UI/Widgets/SubMenu/Submenu.uasset b/Content/Blueprints/UI/Widgets/SubMenu/Submenu.uasset index 2ebf3cf..00dd9c2 100644 Binary files a/Content/Blueprints/UI/Widgets/SubMenu/Submenu.uasset and b/Content/Blueprints/UI/Widgets/SubMenu/Submenu.uasset differ diff --git a/Content/Blueprints/UI/Widgets/SubMenu/SystemPanel.uasset b/Content/Blueprints/UI/Widgets/SubMenu/SystemPanel.uasset index 350729a..7ccced9 100644 Binary files a/Content/Blueprints/UI/Widgets/SubMenu/SystemPanel.uasset and b/Content/Blueprints/UI/Widgets/SubMenu/SystemPanel.uasset differ diff --git a/Content/Blueprints/UI/Widgets/UI_STATES.uasset b/Content/Blueprints/UI/Widgets/UI_STATES.uasset index fcb468e..d3733b3 100644 Binary files a/Content/Blueprints/UI/Widgets/UI_STATES.uasset and b/Content/Blueprints/UI/Widgets/UI_STATES.uasset differ diff --git a/Content/Blueprints/UI/Widgets/UI_STATE_struct.uasset b/Content/Blueprints/UI/Widgets/UI_STATE_struct.uasset index 3e18152..44a8797 100644 Binary files a/Content/Blueprints/UI/Widgets/UI_STATE_struct.uasset and b/Content/Blueprints/UI/Widgets/UI_STATE_struct.uasset differ diff --git a/Content/Blueprints/UI/Widgets/UI_StateFL.uasset b/Content/Blueprints/UI/Widgets/UI_StateFL.uasset index 8ee6608..879645d 100644 Binary files a/Content/Blueprints/UI/Widgets/UI_StateFL.uasset and b/Content/Blueprints/UI/Widgets/UI_StateFL.uasset differ diff --git a/Content/Blueprints/UI/Widgets/typography.uasset b/Content/Blueprints/UI/Widgets/typography.uasset index 9f6f9b7..cdbc927 100644 Binary files a/Content/Blueprints/UI/Widgets/typography.uasset and b/Content/Blueprints/UI/Widgets/typography.uasset differ diff --git a/Content/Blueprints/UI/Widgets/widgetActions.uasset b/Content/Blueprints/UI/Widgets/widgetActions.uasset index 70b12af..5322192 100644 Binary files a/Content/Blueprints/UI/Widgets/widgetActions.uasset and b/Content/Blueprints/UI/Widgets/widgetActions.uasset differ diff --git a/Content/Blueprints/UI/mainHUD.uasset b/Content/Blueprints/UI/mainHUD.uasset index e11990e..98f1220 100644 Binary files a/Content/Blueprints/UI/mainHUD.uasset and b/Content/Blueprints/UI/mainHUD.uasset differ diff --git a/Content/Blueprints/genTest.uasset b/Content/Blueprints/genTest.uasset new file mode 100644 index 0000000..97f0773 Binary files /dev/null and b/Content/Blueprints/genTest.uasset differ diff --git a/Content/Blueprints/imp.uasset b/Content/Blueprints/imp.uasset new file mode 100644 index 0000000..dbe0f3c Binary files /dev/null and b/Content/Blueprints/imp.uasset differ diff --git a/Content/Blueprints/utils/BP_skeletalOptimize.uasset b/Content/Blueprints/utils/BP_skeletalOptimize.uasset index f3688ba..d2be664 100644 Binary files a/Content/Blueprints/utils/BP_skeletalOptimize.uasset and b/Content/Blueprints/utils/BP_skeletalOptimize.uasset differ diff --git a/Content/Blueprints/world/BM_Elevator.uasset b/Content/Blueprints/world/BM_Elevator.uasset index 50c8487..64da219 100644 Binary files a/Content/Blueprints/world/BM_Elevator.uasset and b/Content/Blueprints/world/BM_Elevator.uasset differ diff --git a/Content/Blueprints/world/BP_Door_Outer.uasset b/Content/Blueprints/world/BP_Door_Outer.uasset index 8dcb765..07abab2 100644 Binary files a/Content/Blueprints/world/BP_Door_Outer.uasset and b/Content/Blueprints/world/BP_Door_Outer.uasset differ diff --git a/Content/Blueprints/world/BP_House.uasset b/Content/Blueprints/world/BP_House.uasset index 207146b..9232dfc 100644 Binary files a/Content/Blueprints/world/BP_House.uasset and b/Content/Blueprints/world/BP_House.uasset differ diff --git a/Content/Blueprints/world/BP_flatSignSingle.uasset b/Content/Blueprints/world/BP_flatSignSingle.uasset index 5ed5d89..8faf0e9 100644 Binary files a/Content/Blueprints/world/BP_flatSignSingle.uasset and b/Content/Blueprints/world/BP_flatSignSingle.uasset differ diff --git a/Content/Blueprints/world/actorTourHider.uasset b/Content/Blueprints/world/actorTourHider.uasset deleted file mode 100644 index bf720d9..0000000 Binary files a/Content/Blueprints/world/actorTourHider.uasset and /dev/null differ diff --git a/Content/Blueprints/world/filterFlatPreview.uasset b/Content/Blueprints/world/filterFlatPreview.uasset new file mode 100644 index 0000000..3effa9d Binary files /dev/null and b/Content/Blueprints/world/filterFlatPreview.uasset differ diff --git a/Content/Blueprints/world/filterFlatPreviewMesh.uasset b/Content/Blueprints/world/filterFlatPreviewMesh.uasset new file mode 100644 index 0000000..c72b946 Binary files /dev/null and b/Content/Blueprints/world/filterFlatPreviewMesh.uasset differ diff --git a/Content/Maps/_MainScene.umap b/Content/Maps/_MainScene.umap index 37b9976..d3f6e7f 100644 Binary files a/Content/Maps/_MainScene.umap and b/Content/Maps/_MainScene.umap differ diff --git a/Plugins/manageTextFile/Binaries/Win64/UnrealEditor-manageTextFile.dll b/Plugins/manageTextFile/Binaries/Win64/UnrealEditor-manageTextFile-0001.dll similarity index 78% rename from Plugins/manageTextFile/Binaries/Win64/UnrealEditor-manageTextFile.dll rename to Plugins/manageTextFile/Binaries/Win64/UnrealEditor-manageTextFile-0001.dll index 363c312..041f472 100644 Binary files a/Plugins/manageTextFile/Binaries/Win64/UnrealEditor-manageTextFile.dll and b/Plugins/manageTextFile/Binaries/Win64/UnrealEditor-manageTextFile-0001.dll differ diff --git a/Plugins/manageTextFile/Binaries/Win64/UnrealEditor-manageTextFile.pdb b/Plugins/manageTextFile/Binaries/Win64/UnrealEditor-manageTextFile-0001.pdb similarity index 82% rename from Plugins/manageTextFile/Binaries/Win64/UnrealEditor-manageTextFile.pdb rename to Plugins/manageTextFile/Binaries/Win64/UnrealEditor-manageTextFile-0001.pdb index 771b522..9c562b0 100644 Binary files a/Plugins/manageTextFile/Binaries/Win64/UnrealEditor-manageTextFile.pdb and b/Plugins/manageTextFile/Binaries/Win64/UnrealEditor-manageTextFile-0001.pdb differ diff --git a/Plugins/manageTextFile/Binaries/Win64/UnrealEditor.modules b/Plugins/manageTextFile/Binaries/Win64/UnrealEditor.modules index 71ca57e..0b76aa6 100644 --- a/Plugins/manageTextFile/Binaries/Win64/UnrealEditor.modules +++ b/Plugins/manageTextFile/Binaries/Win64/UnrealEditor.modules @@ -2,6 +2,6 @@ "BuildId": "27405482", "Modules": { - "manageTextFile": "UnrealEditor-manageTextFile.dll" + "manageTextFile": "UnrealEditor-manageTextFile-0001.dll" } } \ No newline at end of file diff --git a/Plugins/manageTextFile/Source/manageTextFile/Private/manageTextFileBPLibrary.cpp b/Plugins/manageTextFile/Source/manageTextFile/Private/manageTextFileBPLibrary.cpp index 1a39743..bce4b51 100644 --- a/Plugins/manageTextFile/Source/manageTextFile/Private/manageTextFileBPLibrary.cpp +++ b/Plugins/manageTextFile/Source/manageTextFile/Private/manageTextFileBPLibrary.cpp @@ -1,6 +1,7 @@ // Copyright Epic Games, Inc. All Rights Reserved. #include "manageTextFileBPLibrary.h" +#include "Kismet/KismetStringLibrary.h" #include "manageTextFile.h" UmanageTextFileBPLibrary::UmanageTextFileBPLibrary(const FObjectInitializer& ObjectInitializer) @@ -72,4 +73,36 @@ bool UmanageTextFileBPLibrary::readFile(FString Path, FString FileName,FString & FString fullpath = Path + "\\" + FileName; return FFileHelper::LoadFileToString(Str, *fullpath); -} \ No newline at end of file +} + +bool UmanageTextFileBPLibrary::parseIniFile(FString Path, FString FileName, TMap& Pairs) { + FString outstr; + readFile(Path, FileName, outstr); + FJsonSerializableArray arr; + outstr.ParseIntoArrayLines(arr); + for (auto& a : arr) { + a.TrimStartAndEndInline(); + if (a.StartsWith("#") || a.StartsWith(";")) continue; + FString k; + FString v; + if (!a.Split(L"=", &k, &v)) continue; + k.TrimStartAndEndInline(); + v.TrimStartAndEndInline(); + Pairs.Add(k, v); + } + return !Pairs.IsEmpty(); +} + +FString UmanageTextFileBPLibrary::getValueFromIniFile(FString Path, FString FileName, FString Key, bool& exists, int& asInt, double& asFloat) { + TMap pairs; + parseIniFile(Path, FileName, pairs); + const auto out=pairs.Find(Key); + if (!out) { + exists = false; + return FString(); + } + asInt = UKismetStringLibrary::Conv_StringToInt(*out); + asFloat = UKismetStringLibrary::Conv_StringToDouble(*out); + exists = true; + return *out; +} \ No newline at end of file diff --git a/Plugins/manageTextFile/Source/manageTextFile/Public/manageTextFileBPLibrary.h b/Plugins/manageTextFile/Source/manageTextFile/Public/manageTextFileBPLibrary.h index ec551b0..bafe55f 100644 --- a/Plugins/manageTextFile/Source/manageTextFile/Public/manageTextFileBPLibrary.h +++ b/Plugins/manageTextFile/Source/manageTextFile/Public/manageTextFileBPLibrary.h @@ -40,4 +40,11 @@ class UmanageTextFileBPLibrary : public UBlueprintFunctionLibrary static bool DeleteFile(FString Path, FString FileName); UFUNCTION(BlueprintCallable, Category = "manageTextFile") static bool readFile(FString Path, FString FileName, FString & Str); + + /*# or ; at line begin is comment. line-by-line key=value.*/ + UFUNCTION(BlueprintCallable, Category = "manageTextFile") + static bool parseIniFile(FString Path, FString FileName, TMap& Pairs); + /*# or ; at line begin is comment. line-by-line key=value.*/ + UFUNCTION(BlueprintCallable, Category = "manageTextFile") + static FString getValueFromIniFile(FString Path, FString FileName, FString Key, bool& exists, int& asInt, double& asFloat); }; diff --git a/Source/GraffModule/GraffModule.Build.cs b/Source/GraffModule/GraffModule.Build.cs index a2823fb..b71a311 100644 --- a/Source/GraffModule/GraffModule.Build.cs +++ b/Source/GraffModule/GraffModule.Build.cs @@ -8,13 +8,13 @@ public class GraffModule : ModuleRules { PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; - PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore" }); + PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore","UMG" }); PrivateDependencyModuleNames.AddRange(new string[] { }); - // Uncomment if you are using Slate UI - // PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" }); - + //Uncomment if you are using Slate UI + PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" }); + // Uncomment if you are using online features // PrivateDependencyModuleNames.Add("OnlineSubsystem"); diff --git a/Source/GraffModule/Private/RichTextBlockPerc.cpp b/Source/GraffModule/Private/RichTextBlockPerc.cpp new file mode 100644 index 0000000..1655b35 --- /dev/null +++ b/Source/GraffModule/Private/RichTextBlockPerc.cpp @@ -0,0 +1,12 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "RichTextBlockPerc.h" + + + +void URichTextBlockPerc::setLineHeightPercentage(float newPerc) +{ + LineHeightPercentage = newPerc; + SynchronizeProperties(); +} diff --git a/Source/GraffModule/Private/cppFuncLibrary.cpp b/Source/GraffModule/Private/cppFuncLibrary.cpp index f37ce9c..ea1358e 100644 --- a/Source/GraffModule/Private/cppFuncLibrary.cpp +++ b/Source/GraffModule/Private/cppFuncLibrary.cpp @@ -2,9 +2,29 @@ #include "cppFuncLibrary.h" +#include "cppGI.h" +#include "Kismet/GameplayStatics.h" #include "Kismet/KismetStringLibrary.h" +#include "Kismet/KismetTextLibrary.h" #include "Kismet/KismetmathLibrary.h" +bool operator==(const Fcppcoords c1, const Fcppcoords c2) { + return c1.flat == c2.flat && + c1.floor == c2.floor && + c1.house == c2.house && + c1.section == c2.section && + c1.type == c2.type && + c1.zone == c2.zone; +} +// +//bool operator==(const FcppLevelStruct& c1, const FcppLevelStruct& c2) { +// return c1.anotherLvl == c2.anotherLvl && +// c1.coords == c2.coords && +// c1.dontUnload == c2.dontUnload && +// c1.path == c2.path && +// c1.uniqName == c2.uniqName && +// c1.Z == c2.Z; +//} TArray UcppFuncLibrary::cppUniversalParser(FString string, TArray keys, FString delimiter, bool caseSensitive) { @@ -201,7 +221,7 @@ FString UcppFuncLibrary::multiRemove(FString source, UPARAM(ref)TArray& FString UcppFuncLibrary::quoteString(FString string) { - return FString("""").Append(string).Append(""""); + return FString("\"").Append(string).Append("\""); } void UcppFuncLibrary::getRange(double value, double minMult, double maxMult, double& bMin, double& bValue, double& bMax) @@ -211,18 +231,48 @@ void UcppFuncLibrary::getRange(double value, double minMult, double maxMult, dou bValue = value; } -void UcppFuncLibrary::updateFilterList(TArray flats, int floorMin, int floorMax, float sqMin, float sqMax, int priceMin, int priceMax, TArray houses, TArray sections, TArray rooms, int sortType, bool onlyAvailable, TArray& filtered, int& count) +void UcppFuncLibrary::updateFilterList(UObject* WorldContextObject, int floorMin, int floorMax, float sqMin, float sqMax, int priceMin, int priceMax, TArray houses, TArray sections, TArray rooms, TArray Tags, int sortType, bool onlyAvailable, TArray& filtered, int& count, TArray houseMap) { + for (auto& hm : houseMap) { + + } + + auto gi = StaticCastPtr(UGameplayStatics::GetGameInstance(WorldContextObject)); + if (!gi) return; TArray tempfloor, tempprice; TArray tempsq; - for (auto& flat : flats) { + for (auto& flat : gi->flatArray) { if (inRange(flat.Floor, floorMin, floorMax) && inRange(flat.Price, priceMin, priceMax) && inRange(flat.Square, sqMin, sqMax) - && boolGet(houses, flat.House) - && boolGet(sections, flat.Section) - && boolGet(rooms, flat.Rooms) - && (onlyAvailable?flat.available:true)) { + //&& boolGet(houses, flat.House) + //&& boolGet(sections, flat.Section) + && [](TArray& houseMap_, TArray& houses_, TArray& sections_, FcppflatStruct& flat_) { + if (houseMap_.IsEmpty()) return boolGet(houses_, flat_.House) && boolGet(sections_, flat_.Section); //if no map use classic + if (!houses_.Contains(true)) return true; //if no select then pass + for (int n = 0; n < houses_.Num(); n++) { + if (houseMap_.IsValidIndex(n)) { + if (houseMap_[n].X == flat_.House && houseMap_[n].Y == flat_.Section) return houses_[n]; + } + + } + return false; + }(houseMap, houses, sections, flat) + && boolGet(rooms, flat.Rooms) + && [](TArray tags, TArray ftags) { + int n = 0; + for (auto& t : tags) { + if (ftags.IsValidIndex(n)) + { + if (t && !ftags[n]) return false; + } + n++; + + + } + return true; + }(Tags, flat.tags) + && (onlyAvailable ? flat.available : true)) { filtered.Add(flat); tempfloor.Add(flat.Floor); tempprice.Add(flat.Price); @@ -274,6 +324,73 @@ void UcppFuncLibrary::updateFilterList(TArray flats, int floorMi } } +void UcppFuncLibrary::groupFiltered(UPARAM(ref)TArray& filtered, UPARAM(ref)TArray& filtered_grouped) +{ + + TArray filteredCoords; + for (auto& f : filtered) { + filteredCoords.Add(Fcppcoords(f.FlatId, f.flatType, f.Zone, f.House, f.Section)); + } + TArray filtered_grCoords; + //for (auto& f : filtered_grouped) { + // Fcppcoords ff; + // ff.flat = f.FlatId; + // ff.house = f.House; + // ff.section = f.Section; + // ff.type = f.flatType; + // ff.zone = f.Zone; + // //skip floor + // filtered_grCoords.Add(ff); + //} + filtered_grouped.Empty(); + int nn = 0; + for (auto& obj : filtered) { + if (filtered_grCoords.Contains(filteredCoords[nn])) { + auto fc = filtered_grCoords.Find(filteredCoords[nn]); + FJsonSerializableArray opts; + filtered_grouped[fc].comment.ParseIntoArray(opts, L";"); + FString l; + FString r; + opts[0].Split(L"=", &l, &r); + //auto cn = FCString::Atoi(*r); //current N + auto cn = UKismetStringLibrary::Conv_StringToInt(r); + opts[1].Split(L"=", &l, &r); + //auto csqf=FCString::Atof(*r);// current sqfrom + auto csqf = UKismetStringLibrary::Conv_StringToFloat(r); + opts[2].Split(L"=", &l, &r); + //auto csqt=FCString::Atof(*r);// current sqto + auto csqt = UKismetStringLibrary::Conv_StringToFloat(r); + cn++; + + csqt = obj.Square > csqt ? obj.Square : csqt; + csqf = obj.Square < csqf ? obj.Square : csqf; + if (filtered_grouped[fc].Price > obj.Price) filtered_grouped[fc].Price = obj.Price; + filtered_grouped[fc].comment = + L"n=" + + FString::FromInt(cn) + + L";sqfrom=" + + UKismetTextLibrary::Conv_FloatToText(csqf, ERoundingMode::HalfToEven, false, false, 1, 5, 2, 2).ToString() + + L";sqto=" + + UKismetTextLibrary::Conv_FloatToText(csqt, ERoundingMode::HalfToEven, false, false, 1, 5, 2, 2).ToString(); + filtered_grouped[fc].comment.ReplaceCharInline(*L",", *L"."); + obj.comment = filtered_grouped[fc].comment; + //here is place for your commercial + + } + else { + obj.comment = L"n=1;sqfrom=" + + UKismetTextLibrary::Conv_FloatToText(obj.Square, ERoundingMode::HalfToEven, false, false, 1, 5, 2, 2).ToString() + + L";sqto=" + + UKismetTextLibrary::Conv_FloatToText(obj.Square, ERoundingMode::HalfToEven, false, false, 1, 5, 2, 2).ToString(); + obj.comment.ReplaceCharInline(*L",", *L"."); //parser dont understand , lol + //UE_LOG(LogTemp, Warning, TEXT("start sq %f, txt %s"), obj.Square, *obj.comment); + filtered_grouped.Add(obj); + filtered_grCoords.Add(Fcppcoords(obj.FlatId, obj.flatType, obj.Zone, obj.House, obj.Section)); + } + nn++; + } +} + bool UcppFuncLibrary::inRange(float in, float min, float max) { return (in >= min) && (in <= max); @@ -324,4 +441,3 @@ void UcppFuncLibrary::minmaxInRange(TArray arr, int min, int max, int& mi - diff --git a/Source/GraffModule/Private/cppGI.cpp b/Source/GraffModule/Private/cppGI.cpp index 983fe1b..9515d98 100644 --- a/Source/GraffModule/Private/cppGI.cpp +++ b/Source/GraffModule/Private/cppGI.cpp @@ -145,15 +145,15 @@ TArray UcppGI::getFlatArr_(Fcppcoords coords, int& len) auto output = TArray(); for (auto& flat : flatArray) { auto flatcoords = Fcppcoords(); - flatcoords.flat = coords.flat < 0 ? -2 : flat.FlatId; //ignore flat - flatcoords.floor = coords.floor < 0 ? -2 : flat.Floor; + flatcoords.flat = coords.floor < 0 ? -2 : flat.FlatId; //ignore flat + flatcoords.floor =coords.floor<0?-2: flat.Floor; flatcoords.house = coords.house < 1 ? -2 : flat.House; flatcoords.section = coords.section < 1 ? -2 : flat.Section; flatcoords.type = coords.type < 0 ? -2 : flat.flatType; flatcoords.zone = coords.zone < 1 ? -2 : flat.Zone; - + bool dummy[6]; bool eq; - cppCoordsEq(coords, flatcoords, true, false, boolDummy, boolDummy, boolDummy, boolDummy, boolDummy, boolDummy, eq); + cppCoordsEq(coords, flatcoords, true, false, dummy[0], dummy[1], dummy[2], dummy[3], dummy[4], dummy[5], eq); if (eq) output.Add(flat); } len = output.Num(); @@ -166,27 +166,21 @@ FcppflatStruct UcppGI::findFlatByCoords_(Fcppcoords coords, bool& success) if (coords.flat < 0) return FcppflatStruct(); int len; auto tt = getFlatArr_(coords, len); - if (len > 1) UE_LOG(LogCore, Warning, TEXT("UcppGI::findFlatByCoords: found more than one flat")); - if (len == 0) return FcppflatStruct(); + if (len>1) UE_LOG(LogCore, Warning, TEXT("UcppGI::findFlatByCoords: found more than one flat: GP%d-S%d-F%d-A%d"),coords.house,coords.section,coords.floor,coords.flat); + if (len==0) return FcppflatStruct(); success = true; return tt[0]; } -FcppflatStruct UcppGI::findFlatByN_(Fcppcoords filter, int num, bool& success) +TArray UcppGI::findFlatsByN_(int num, bool& success) { success = false; - filter.flat = -2; - auto output = FcppflatStruct(); - - auto arr = getFlatArr_(filter, intDummy); - for (auto& flat : arr) { - if (flat.FlatN == num) { - if (!success) output = flat; - else UE_LOG(LogCore, Warning, TEXT("UcppGI::findFlatByN_: found more than one flat")); - success = true; - } + auto output = TArray(); + for (auto& flat : flatArray) { + if (flat.FlatN == num) output.Add(flat); } - + + success = !output.IsEmpty(); return output; } @@ -195,7 +189,7 @@ void UcppGI::countFreeApartments(Fcppcoords coords, int& free, int& all, float& int len; free = 0; minPrice = 0; - bool temp = false; + bool temp=false; for (auto& flat : getFlatArr_(coords, len)) { if (flat.available) { if (!temp) { @@ -211,30 +205,3 @@ void UcppGI::countFreeApartments(Fcppcoords coords, int& free, int& all, float& return; } -void UcppGI::cppFlatTocppCoords(FcppflatStruct flat, Fcppcoords& coords) -{ - coords.flat = flat.FlatId; - coords.floor = flat.Floor; - coords.house = flat.House; - coords.section = flat.Section; - coords.type = flat.flatType; - coords.zone = flat.Zone; -} - -void UcppGI::cppCoordsToCppFlat(UObject* WorldContextObject, Fcppcoords coords, FcppflatStruct& flat, bool onlyCoords) -{ - if (onlyCoords) { - flat.FlatId = coords.flat; - flat.Floor = coords.floor; - flat.House = coords.house; - flat.Section = coords.section; - flat.flatType = coords.type; - flat.Zone = coords.zone; - return; - } - bool dum; - - flat = StaticCastPtr(UGameplayStatics::GetGameInstance(WorldContextObject))->findFlatByCoords_(coords, dum); - -} - diff --git a/Source/GraffModule/Public/RichTextBlockPerc.h b/Source/GraffModule/Public/RichTextBlockPerc.h new file mode 100644 index 0000000..85546e1 --- /dev/null +++ b/Source/GraffModule/Public/RichTextBlockPerc.h @@ -0,0 +1,22 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Components/RichTextBlock.h" +#include "RichTextBlockPerc.generated.h" + +/** + * + */ +UCLASS(MinimalAPI) +class URichTextBlockPerc : public URichTextBlock +{ + GENERATED_BODY() + + UFUNCTION(BlueprintCallable, Category = "Appearance") + void setLineHeightPercentage(float newPerc); + + + +}; diff --git a/Source/GraffModule/Public/cppFuncLibrary.h b/Source/GraffModule/Public/cppFuncLibrary.h index 1f404b2..d9f1800 100644 --- a/Source/GraffModule/Public/cppFuncLibrary.h +++ b/Source/GraffModule/Public/cppFuncLibrary.h @@ -17,64 +17,64 @@ struct FcppflatStruct public: UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (DisplayName = "FlatId", MakeStructureDefaultValue = "-1")) - int32 FlatId=-1; + int32 FlatId; UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (DisplayName = "flatType", MakeStructureDefaultValue = "0")) - int32 flatType=0; + int32 flatType; UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (DisplayName = "Flat#", MakeStructureDefaultValue = "-1")) - int32 FlatN=-1; + int32 FlatN; UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (DisplayName = "Zone", MakeStructureDefaultValue = "-1")) - int32 Zone=-1; + int32 Zone; UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (DisplayName = "House", MakeStructureDefaultValue = "-1")) - int32 House=-1; + int32 House; UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (DisplayName = "Section", MakeStructureDefaultValue = "-1")) - int32 Section = -1; + int32 Section; UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (DisplayName = "Floor", MakeStructureDefaultValue = "-1")) - int32 Floor = -1; + int32 Floor; UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (DisplayName = "Rooms", MakeStructureDefaultValue = "-1")) - int32 Rooms = -1; + int32 Rooms; UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (DisplayName = "Square", MakeStructureDefaultValue = "0.000000")) - double Square = 0; + double Square; UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (DisplayName = "Price", MakeStructureDefaultValue = "0")) - int32 Price=0; + int32 Price; UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (DisplayName = "whitePrice", MakeStructureDefaultValue = "0")) - int32 whitePrice=0; + int32 whitePrice; UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (DisplayName = "price-meter", MakeStructureDefaultValue = "0")) - int32 price_meter=0; + int32 price_meter; UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (DisplayName = "available", MakeStructureDefaultValue = "True")) - bool available=false; + bool available; UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (DisplayName = "tags")) TArray tags; UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (DisplayName = "deadline")) - FIntPoint deadline=FIntPoint(0); + FIntPoint deadline; UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (DisplayName = "comment")) - FString comment=""; + FString comment; }; @@ -165,9 +165,14 @@ class GRAFFMODULE_API UcppFuncLibrary : public UBlueprintFunctionLibrary UFUNCTION(blueprintcallable, BlueprintPure, category = "Math|Float", meta = (Keywords = "minmax")) static void getRange(double value, double minMult, double maxMult, double& bMin, double& bValue, double& bMax); - /*sortType: 0.price min-to-max 1. max-to-min 2.square min-to-max 3. max-to-min 4.floor min-to-max 5. max-to-min*/ + /*sortType: 0.price min-to-max 1. max-to-min 2.square min-to-max 3. max-to-min 4.floor min-to-max 5. max-to-min + use housemap to remap houses array to house-section pair. example: 0:1,1 1:2,1 2:2,2... + sections array will be ignored if using housemap*/ + UFUNCTION(blueprintcallable, category = "Widget|Search", meta = (WorldContext = "WorldContextObject")) + static void updateFilterList(UObject* WorldContextObject, int floorMin, int floorMax, float sqMin, float sqMax, int priceMin, int priceMax, TArray houses, TArray sections, TArray rooms, TArray Tags, int sortType, bool onlyAvailable, TArray& filtered, int& count, TArray houseMap); + /*additional info in comment: n=int;sqFrom=float;sqTo=float*/ UFUNCTION(blueprintcallable, category = "Widget|Search") - static void updateFilterList(TArray flats, int floorMin, int floorMax, float sqMin, float sqMax, int priceMin, int priceMax, TArray houses, TArray sections, TArray rooms, int sortType, bool onlyAvailable, TArray& filtered, int& count); + static void groupFiltered(UPARAM(ref) TArray& filtered, UPARAM(ref) TArray& filtered_grouped); private: diff --git a/Source/GraffModule/Public/cppGI.h b/Source/GraffModule/Public/cppGI.h index 520b6a0..61fd265 100644 --- a/Source/GraffModule/Public/cppGI.h +++ b/Source/GraffModule/Public/cppGI.h @@ -7,26 +7,35 @@ #include "cppGI.generated.h" /** - * + * */ + USTRUCT(BlueprintType) struct Fcppcoords { GENERATED_BODY() + Fcppcoords(int32 flat_=-1, int32 type_=0, int32 zone_=-1, int32 house_=-1, int32 section_=-1, int32 floor_=-1) { + flat = flat_; + type = type_; + zone = zone_; + house = house_; + section = section_; + floor = floor_; + } + UPROPERTY(BlueprintReadWrite, category = "default") + int32 flat; UPROPERTY(BlueprintReadWrite, category = "default") - int32 flat = -1; + int32 type; UPROPERTY(BlueprintReadWrite, category = "default") - int32 type = 0; + int32 zone; UPROPERTY(BlueprintReadWrite, category = "default") - int32 zone = 1; + int32 house; UPROPERTY(BlueprintReadWrite, category = "default") - int32 house = -1; + int32 section; UPROPERTY(BlueprintReadWrite, category = "default") - int32 section = -1; - UPROPERTY(BlueprintReadWrite, category = "default") - int32 floor = -1; + int32 floor; }; @@ -35,18 +44,18 @@ struct FcppLevelStruct { GENERATED_BODY() + UPROPERTY(BlueprintReadWrite) + Fcppcoords coords; UPROPERTY(BlueprintReadWrite) - Fcppcoords coords; + bool dontUnload = false; UPROPERTY(BlueprintReadWrite) - bool dontUnload = false; + FString path; UPROPERTY(BlueprintReadWrite) - FString path; + float Z = 0; UPROPERTY(BlueprintReadWrite) - float Z = 0; + int32 anotherLvl = -1; UPROPERTY(BlueprintReadWrite) - int32 anotherLvl = -1; - UPROPERTY(BlueprintReadWrite) - FName uniqName; + FName uniqName; }; UCLASS() @@ -54,61 +63,53 @@ class GRAFFMODULE_API UcppGI : public UGameInstance { GENERATED_BODY() public: - UFUNCTION(blueprintcallable, category = "cppFuncLib") - static void cppCoordsEq(Fcppcoords coords, Fcppcoords coords1, bool relevantMinus2, bool fastEq, bool& flat_, bool& type_, bool& zone_, bool& house_, bool& section_, bool& floor_, bool& fullEq); + UFUNCTION(blueprintcallable, category = "cppFuncLib") + static void cppCoordsEq(Fcppcoords coords, Fcppcoords coords1, bool relevantMinus2, bool fastEq, bool& flat_, bool& type_, bool& zone_, bool& house_, bool& section_, bool& floor_, bool& fullEq); - - /*returns array of levels for binding*/ + + /*returns array of levels for binding*/ UFUNCTION(blueprintcallable, Category = "LevelLoading", meta = (WorldContext = "WorldContextObject")) - TArray cppLvlManage(UObject* WorldContextObject, Fcppcoords currentCoords, uint8 currentState); + TArray cppLvlManage(UObject* WorldContextObject, Fcppcoords currentCoords, uint8 currentState); + + /*return array filtered by coords, coord<0 for floor and <1 for other is ignore the one*/ + UFUNCTION(blueprintcallable, category = "Data") + TArray getFlatArr_(Fcppcoords coords, int& len); - /*return array filtered by coords, coord<0 for (floor,flat,type) and <1 for other is ignore the one*/ - UFUNCTION(blueprintcallable, category = "Data") - TArray getFlatArr_(Fcppcoords coords, int& len); + + UFUNCTION(blueprintcallable, category = "Data") + FcppflatStruct findFlatByCoords_(Fcppcoords coords, bool& success); + /*return array with flats with specified number + (may be from different houses if not sequetnal numeration)*/ + UFUNCTION(blueprintcallable, category = "Data") + TArray findFlatsByN_(int num, bool& success); - UFUNCTION(blueprintcallable, category = "Data") - FcppflatStruct findFlatByCoords_(Fcppcoords coords, bool& success); - - /*flatId is ignoring, filter is optional*/ - UFUNCTION(blueprintcallable, category = "Data") - FcppflatStruct findFlatByN_(Fcppcoords filter, int num, bool& success); - - /*coord<0 for (floor,flat,type) and <1 for other is ignore the one, price is millions*/ - UFUNCTION(blueprintcallable, category = "Data") - void countFreeApartments(Fcppcoords coords, int& free, int& all, float& minPrice); - - UFUNCTION(blueprintcallable,blueprintPure, category = "Data",meta=( BlueprintAutocast)) - static void cppFlatTocppCoords(FcppflatStruct flat, Fcppcoords& coords); - - /*if onlyCoords false then same as find flat by coords*/ - UFUNCTION(blueprintcallable, blueprintPure, category = "Data", meta = (WorldContext = "WorldContextObject", BlueprintAutocast)) - static void cppCoordsToCppFlat(UObject* WorldContextObject,Fcppcoords coords,FcppflatStruct& flat,bool onlyCoords=true ); + /*coord=-2 is ignore the one, price is millions*/ + UFUNCTION(blueprintcallable, category = "Data") + void countFreeApartments(Fcppcoords coords,int& free,int& all,float& minPrice); /*list of lvls for anyway loading*/ UPROPERTY(BlueprintReadWrite, EditDefaultsOnly, Category = "levelLoading") - TArray cppWhiteList; + TArray cppWhiteList; /*list of lvls for anyway not loading*/ UPROPERTY(BlueprintReadWrite, EditDefaultsOnly, Category = "levelLoading") - TArray cppBlackList; + TArray cppBlackList; /*list of coords for regular loading*/ UPROPERTY(BlueprintReadWrite, EditDefaultsOnly, Category = "LevelLoading") - TArray cppLoadList; + TArray cppLoadList; /*list of created level names*/ UPROPERTY(BlueprintReadWrite, EditDefaultsOnly, Category = "LevelLoading") - TArray cppCreatedList; + TArray cppCreatedList; /*list of loaded/loading right now level names*/ UPROPERTY(BlueprintReadWrite, EditDefaultsOnly, Category = "LevelLoading") - TArray cpploadedList; + TArray cpploadedList; /*list of lvls struct created by levelloader*/ UPROPERTY(BlueprintReadWrite, EditDefaultsOnly, Category = "levelLoading") - TArray cppLevels; - /*list of all flats in project*/ - UPROPERTY(BlueprintReadWrite, EditDefaultsOnly, Category = "Data") - TArray flatArray; + TArray cppLevels; + /*list of all flats in project*/ +UPROPERTY(BlueprintReadWrite, EditDefaultsOnly, Category = "Data") + TArray flatArray; -private: - bool boolDummy; - int intDummy; + }; diff --git a/aa.csv b/aa.csv new file mode 100644 index 0000000..adc9bbc --- /dev/null +++ b/aa.csv @@ -0,0 +1,23 @@ +Elevation,WKT +"2","MultiPolygon (((82.90669122 54.98830626, 82.90664145 54.98830533, 82.90659169 54.98830941, 82.90654372 54.9883187, 82.90649934 54.98833167, 82.90645937 54.98834944, 82.90642442 54.98837041, 82.9063972 54.98839484, 82.90637735 54.98842129, 82.90636513 54.98844918, 82.90636253 54.98847269, 82.90636244 54.98848963, 82.90639172 54.98848994, 82.90643206 54.98848916, 82.90648173 54.98848322, 82.90652791 54.98847263, 82.90657112 54.98845755, 82.90660902 54.98843818, 82.90664109 54.98841581, 82.90666481 54.98839092, 82.90668269 54.98836359, 82.90669113 54.98833503, 82.90669122 54.98830626)))" +"2","MultiPolygon (((82.90622571 54.98561971, 82.90584429 54.98539453, 82.90529452 54.98570076, 82.90514019 54.9855351, 82.90507291 54.98557255, 82.90522706 54.98573832, 82.90542442 54.98585548, 82.90583917 54.98562323, 82.90602431 54.98573253, 82.90622571 54.98561971)))" +"1","MultiPolygon (((82.90576344 54.98843193, 82.90589891 54.98835745, 82.90562887 54.98819515, 82.90549332 54.98826963, 82.90576344 54.98843193)))" +"1","MultiPolygon (((82.90721305 54.98663132, 82.90687654 54.98681878, 82.90696422 54.9868707, 82.90730055 54.98668313, 82.90721305 54.98663132)))" +"1","MultiPolygon (((82.90524269 54.98616465, 82.90535489 54.9861022, 82.90513731 54.98597305, 82.90502511 54.98603556, 82.90524269 54.98616465)))" +"1","MultiPolygon (((82.90502314 54.98580651, 82.90491094 54.98586901, 82.90496529 54.98590125, 82.90507758 54.98583874, 82.90502314 54.98580651)))" +"1","MultiPolygon (((82.90673964 54.98699565, 82.90686999 54.98707309, 82.90692622 54.98704189, 82.90679578 54.9869644, 82.90673964 54.98699565)))" +"1","MultiPolygon (((82.90670829 54.98691233, 82.90679578 54.9869644, 82.90692622 54.98704189, 82.90714307 54.98717103, 82.90721045 54.98713352, 82.90677566 54.98687488, 82.90670829 54.98691233)))" +"1","MultiPolygon (((82.9074936 54.98746913, 82.90752728 54.98745033, 82.90749467 54.98743096, 82.90746099 54.98744976, 82.9074936 54.98746913)))" +"1","MultiPolygon (((82.90296159 54.98643662, 82.90299519 54.98641782, 82.90296249 54.9863985, 82.9029289 54.98641725, 82.90296159 54.98643662)))" +"1","MultiPolygon (((82.9063363 54.98641798, 82.90630369 54.98639866, 82.90627 54.98641746, 82.90630261 54.98643678, 82.9063363 54.98641798)))" +"1","MultiPolygon (((82.90531716 54.98616103, 82.90537142 54.98619337, 82.90542765 54.98616217, 82.9053733 54.98612983, 82.90531716 54.98616103)))" +"5","MultiPolygon (((82.90698515 54.98751991, 82.90707947 54.98757596, 82.90726488 54.9874727, 82.90711154 54.98738163, 82.90707193 54.98740368, 82.90661873 54.98713476, 82.90654587 54.98717537, 82.90650671 54.98719711, 82.90643304 54.98723818, 82.90680234 54.98745741, 82.90664002 54.9875478, 82.90661154 54.98753091, 82.90605935 54.98783847, 82.906088 54.98785546, 82.90592532 54.98794607, 82.90555431 54.98772576, 82.90536171 54.98783289, 82.90581662 54.98810284, 82.90578284 54.98812164, 82.90593107 54.98820966, 82.90611926 54.98810485, 82.90603006 54.98805191, 82.90638615 54.98785355, 82.90662088 54.98772281, 82.90698515 54.98751991)),((82.90638615 54.98785355, 82.90641876 54.98787297, 82.90636837 54.98790113, 82.90643349 54.98793987, 82.90646718 54.98792117, 82.90650527 54.98794379, 82.90653896 54.98792504, 82.90657156 54.98794436, 82.90677333 54.98783206, 82.90674054 54.98781259, 82.90677396 54.98779399, 82.90673596 54.98777142, 82.90676937 54.98775282, 82.9067038 54.98771388, 82.90665322 54.98774203, 82.90662088 54.98772281, 82.90638615 54.98785355)),((82.90633998 54.98705304, 82.90630072 54.98707469, 82.90650671 54.98719711, 82.90654587 54.98717537, 82.90633998 54.98705304)))" +"6","MultiPolygon (((82.90571358 54.98659712, 82.90522481 54.98630676, 82.90518672 54.98628413, 82.90440222 54.98581818, 82.90435551 54.98584417, 82.90428814 54.98588162, 82.90423379 54.98591194, 82.9055438 54.98669011, 82.90561908 54.98673479, 82.90624431 54.98710578, 82.90630072 54.98707469, 82.90633998 54.98705304, 82.90641337 54.98701265, 82.90578743 54.98664103, 82.90571358 54.98659712)),((82.90565007 54.98695304, 82.90556842 54.98676253, 82.90561908 54.98673479, 82.9055438 54.98669011, 82.90549368 54.98671784, 82.90516615 54.98666314, 82.90511054 54.98677312, 82.90533261 54.98681026, 82.90540151 54.98685133, 82.90545658 54.98698031, 82.90565007 54.98695304)),((82.90545541 54.98627308, 82.90540708 54.98624436, 82.90518672 54.98628413, 82.90522481 54.98630676, 82.90539549 54.98627597, 82.90542199 54.98629173, 82.90545541 54.98627308)))" +"11","MultiPolygon (((82.90393474 54.98623428, 82.90385964 54.98627607, 82.90372049 54.98635361, 82.90337356 54.98654676, 82.90354748 54.98665002, 82.90410856 54.98633749, 82.90393474 54.98623428)))" +"2","MultiPolygon (((82.90507291 54.98557255, 82.90514019 54.9855351, 82.90595891 54.98507921, 82.90592065 54.98505648, 82.90577188 54.98496804, 82.90583908 54.98493043, 82.90600113 54.98483982, 82.90608144 54.98488606, 82.90612492 54.9848624, 82.90604461 54.98481616, 82.90618188 54.98473971, 82.90599143 54.98462471, 82.90323846 54.98615773, 82.90343105 54.9862721, 82.90350948 54.98622839, 82.90364872 54.98615086, 82.90421232 54.98583699, 82.90428814 54.98588162, 82.90435551 54.98584417, 82.9042796 54.98579953, 82.90439055 54.9857378, 82.90448864 54.98579602, 82.9045977 54.98573522, 82.90468627 54.98578781, 82.90495298 54.98563939, 82.90507291 54.98557255)),((82.90350948 54.98622839, 82.90372049 54.98635361, 82.90385964 54.98627607, 82.90364872 54.98615086, 82.90350948 54.98622839)),((82.90495298 54.98563939, 82.90468627 54.98578781, 82.9047894 54.98584913, 82.90505611 54.98570066, 82.90495298 54.98563939)),((82.90577188 54.98496804, 82.90592065 54.98505648, 82.90598802 54.98501903, 82.90583908 54.98493043, 82.90577188 54.98496804)))" +"5","MultiPolygon (((82.90670802 54.98532981, 82.90801965 54.98610824, 82.90819329 54.98601159, 82.90619355 54.98482489, 82.90612492 54.9848624, 82.90608144 54.98488606, 82.90602018 54.98492155, 82.90663606 54.98528714, 82.90670802 54.98532981)),((82.90600724 54.98533771, 82.90653976 54.98565386, 82.90676416 54.98552879, 82.90656393 54.98541008, 82.90649206 54.98536741, 82.90623164 54.9852127, 82.90600724 54.98533771)),((82.90656393 54.98541008, 82.90670802 54.98532981, 82.90663606 54.98528714, 82.90649206 54.98536741, 82.90656393 54.98541008)))" +"3","MultiPolygon (((82.90816778 54.98670013, 82.90798506 54.98680096, 82.90821216 54.986938, 82.90910993 54.98643755, 82.90894689 54.9863408, 82.90823264 54.98673902, 82.90816778 54.98670013)),((82.90816778 54.98670013, 82.90796072 54.98657755, 82.90779759 54.98648074, 82.90699961 54.98692488, 82.90726722 54.98708383, 82.90788724 54.98674181, 82.90798506 54.98680096, 82.90816778 54.98670013)),((82.90796072 54.98657755, 82.90867749 54.98617782, 82.90851444 54.98608102, 82.90779759 54.98648074, 82.90796072 54.98657755)))" +"7","MultiPolygon (((82.90758388 54.98612224, 82.90742092 54.98602538, 82.90661208 54.98647769, 82.90677503 54.98657445, 82.90758388 54.98612224)))" +"2","MultiPolygon (((82.90671646 54.98684074, 82.906217 54.98654464, 82.90625042 54.98652604, 82.9062665 54.9865356, 82.90630611 54.98651349, 82.90614271 54.98641679, 82.90610318 54.98643885, 82.9061198 54.98644871, 82.90608674 54.98646715, 82.90561261 54.98618552, 82.90542199 54.98629173, 82.90582839 54.98653328, 82.90571358 54.98659712, 82.90578743 54.98664103, 82.90590223 54.98657708, 82.90652575 54.98694694, 82.90671646 54.98684074)))" +"5","MultiPolygon (((82.90637034 54.9862113, 82.90683163 54.98595585, 82.90658216 54.98580708, 82.90650329 54.98585052, 82.90639496 54.98578584, 82.90636253 54.98576642, 82.90605845 54.98593457, 82.90609097 54.98595399, 82.90612304 54.98597305, 82.9060447 54.98601691, 82.90637034 54.9862113)),((82.90601254 54.9859978, 82.9060447 54.98601691, 82.90612304 54.98597305, 82.90609097 54.98595399, 82.90601254 54.9859978)),((82.90689667 54.98599464, 82.90683163 54.98595585, 82.90637034 54.9862113, 82.90633603 54.98623046, 82.90640142 54.98626905, 82.90689667 54.98599464)),((82.90646637 54.98630779, 82.90696152 54.98603349, 82.90689667 54.98599464, 82.90640142 54.98626905, 82.90646637 54.98630779)),((82.90647383 54.9857423, 82.90639496 54.98578584, 82.90650329 54.98585052, 82.90658216 54.98580708, 82.90647383 54.9857423)))" +"1","MultiPolygon (((82.90603123 54.98828394, 82.90599745 54.98830264, 82.90602997 54.98832201, 82.90606375 54.98830331, 82.90603123 54.98828394)))"