Revert "Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev""

This reverts commit ac9303012c.

doc/future_plan.md

@@ -4,9 +4,13 @@ Here list the future plan for Alas, sorted from easy to hard.
 
 Alas has a lot of handful public functions and class methods, from object detection to map logics, don't handcraft them again.
 
-- Test chapter 6 when using 1 fleet
 
-- Add logic to chapter 2, 4, 5, when using 2 fleets
+
+## Plans in 2020.06
+
+- ~~Test chapter 6 when using 1 fleet~~ Done
+
+- ~~Add logic to chapter 2, 4, 5, when using 2 fleets~~ Done
 
   > Chapter 1 to 5 are written in logic of 1 fleet, and I added the logic of 2 fleets in chapter 3, try to imitate that.
 
@@ -66,13 +70,13 @@ Alas has a lot of handful public functions and class methods, from object detect
   >
   > If so, add that option in GUI, and set to default.
 
-- Update cnocr
+- ~~Update cnocr~~ 2020.07.15
 
   > If we use the latest `cnocr`, we can recognize English letters better, get rid of `mxnet==1.4.1`, have smaller model size.
   >
   > But I already train 2 models under `cnocr==1.0.0`, named `stage` and `digit`, test if they are compatible.
 
-- Re-train ocr models
+- ~~Re-train ocr models~~ 2020.07.15
 
   > The existing ocr model named `stage` and `digit` are poorly trained, you need to make sure letters are full-filled the image.
   >
@@ -90,7 +94,7 @@ Alas has a lot of handful public functions and class methods, from object detect
   >
   > Imitating commission.py, use ocr to get research name, classify them, then choose
 
-- Re-fit the relationship between map swipe and screen swipe
+- ~~Re-fit the relationship between map swipe and screen swipe~~ Done, the magic number is 1.626
 
   > This function is `_map_swipe` in module/map/camera.py line 36. If you want to focus camera from D3 to E4, then it will do a swipe (-200, -140). A simple linear fit turn `(1, 1)` to be `(-200, -140)`.
   >