Diff: workinfo/workinfo.cpp

Revision:

38:9bed85d32c97

Parent:

37:d4b711619962

Child:

41:7e3b95c2fcac

diff -r d4b711619962 -r 9bed85d32c97 workinfo/workinfo.cpp
--- a/workinfo/workinfo.cpp	Wed Sep 05 09:37:41 2018 +0000
+++ b/workinfo/workinfo.cpp	Thu Sep 06 03:37:20 2018 +0000
@@ -30,7 +30,7 @@
 //priority 取る順番を決める
 const int kWorkAreaPriority[kWorkAreaNum] = {
     102, 101, 100,
-    104, 105, 106,
+    105, 104, 103,
 };
 const int kCommonAreaPriority[kCommonAreaNum] = {
     17, 16, 15, 14, 13, 12,
@@ -43,9 +43,9 @@
     {0+20,0+30,100},{0,-20,0},{0,0,0},
 };
 const int kCommonAreaCorrect[kCommonAreaNum][3] = {
-    {0,20,20},{0,0,0},{20,40,40},{-10,30,30},{-10,30,0},{-30,30,40},
-    {0,50,0},{0,50,20},{0,50,0},{0,50,20},{0,50,0},
-    {10,50,20},{0,50,20},{30,50,20},{20,50,0},{0,50,0},{-10,30,0},
+    {0,20,40},{0,0,40},{0,40,40},{-10,50,40},{-10,30,40},{-30,50,40},
+    {0,50,40},{0,50,40},{0,50,40},{0,50,40},{0,50,40},
+    {10,50,40},{0,50,40},{30,50,40},{20,50,40},{0,50,40},{-10,50,40},
 };
 const int kBoxCorrect[kBoxNum][3] = {
 {0,0,0},{0,0,0},{0,0,0},
@@ -62,7 +62,7 @@
 
 const int kPitchWorkAreaDegree = -90;
 const int kPitchCommonAreaDegree = -5;
-const int kPitchBoxDegree = 0;
+const int kPitchBoxDegree = 10;
 //////////////////////////////
 //配列のスタート番号
 const int kWorkStart = 0;