Merge branch 'master' of http://39.99.140.129:3000/Mubai_Gao/auto_fill_jewel

# Conflicts:
#	auto_fill_jewel_v3/LevelGenerate.cpp
#	auto_fill_jewel_v3/main.cpp

auto_fill_jewel_v3/LevelGenerate.cpp

@@ -14,6 +14,7 @@
 #include "BoxPositionTool.hpp"
 #include "GridPositionTool.hpp"
 //#include "LevelThumbTool.hpp"
+#include "LevelOutputWriter.hpp"
 
 #define MOVEID_NO_MOVE 0
 #define MOVEID_1ST_LINE 1
@@ -31,8 +32,11 @@ void LevelGenerate::generateAll(FillGlobalConfig::LevelData levelData, string ou
     generate(levelData, false, nullptr , resultPlateFRs, resultPlateCenterPosiArr) ;
     //输出结果
     string pngName0 = outname + "_000000.png" ;
-    //LevelThumbTool ltt ;
-    //ltt.makeThumb3(pngName0, resultPlateFRs, resultPlateCenterPosiArr) ;
+//    LevelThumbTool ltt ;
+//    ltt.makeThumb3(pngName0, resultPlateFRs, resultPlateCenterPosiArr) ;
+    string jsonName = outname + "_000000.json" ;
+    LevelOutputWriter out ;
+    out.writeLevelJson(resultPlateFRs, resultPlateCenterPosiArr, jsonName) ;
     
     //对于所有移动的配置
     vector<FillGlobalConfig::MultiMoveConfig> mmcArr = fgc->getAllMoveConfigByJewels(levelData) ;
@@ -48,7 +52,11 @@ void LevelGenerate::generateAll(FillGlobalConfig::LevelData levelData, string ou
         //输出结果
         string pngName1 = outname + "_" + moveName;
         pngName1 += ".png" ;
-        //ltt.makeThumb3(pngName1, resultPlateFRs1, resultPlateCenterPosiArr1) ;
+//        ltt.makeThumb3(pngName1, resultPlateFRs1, resultPlateCenterPosiArr1) ;
+        
+        string jsonName1 = outname + "_" + moveName + ".json" ;
+        LevelOutputWriter out1 ;
+        out1.writeLevelJson(resultPlateFRs1, resultPlateCenterPosiArr1, jsonName1);
     }
     
     

auto_fill_jewel_v3/LevelOutputWriter.cpp

@@ -106,7 +106,7 @@ bool LevelOutputWriter::writeLevelJson(
         float platex = plateCenterPointArr[i].x;
         float platey = plateCenterPointArr[i].y;
         tiledPlateObj["x"] = platex - fgc->getPlateItemById(plateId)->_bbwid / 2;
-        tiledPlateObj["y"] = platey - fgc->getPlateItemById(plateId)->_bbhei / 2;
+        tiledPlateObj["y"] = 720 - platey + fgc->getPlateItemById(plateId)->_bbhei / 2;
         
         vector<vector<FillResult>>& frArr =  itp->_layersFillResults ;