Merge pull request #31 from BitBoard/dev-sagara

駒落ちの配置の修正
BitBoard · Feb 10, 2024 · a4d9dea · a4d9dea
2 parents 7d5b361 + 257f11e
commit a4d9dea
Show file tree

Hide file tree

Showing 13 changed files with 63 additions and 63 deletions.
diff --git a/Assets/Resources/Data/board-drop-bishop.json b/Assets/Resources/Data/board-drop-bishop.json
@@ -11,7 +11,6 @@
         {"y":0, "x":8, "pieceType":"white_lance"},
 
         {"y":1, "x":1, "pieceType":"white_rook"},
-        {"y":1, "x":7, "pieceType":"white_bishop"},
 
         {"y":2, "x":0, "pieceType":"white_pawn"},
         {"y":2, "x":1, "pieceType":"white_pawn"},
@@ -33,6 +32,7 @@
         {"y":6, "x":7, "pieceType":"black_pawn"},
         {"y":6, "x":8, "pieceType":"black_pawn"},
 
+        {"y":7, "x":1, "pieceType":"black_bishop"},
         {"y":7, "x":7, "pieceType":"black_rook"},
 
         {"y":8, "x":0, "pieceType":"black_lance"},

diff --git a/Assets/Resources/Data/board-drop-eight.json b/Assets/Resources/Data/board-drop-eight.json
@@ -1,17 +1,8 @@
 {
     "boardData" : [
-        {"y":0, "x":0, "pieceType":"white_lance"},
-        {"y":0, "x":1, "pieceType":"white_knight"},
-        {"y":0, "x":2, "pieceType":"white_silver"},
         {"y":0, "x":3, "pieceType":"white_gold"},
         {"y":0, "x":4, "pieceType":"white_king"},
         {"y":0, "x":5, "pieceType":"white_gold"},
-        {"y":0, "x":6, "pieceType":"white_silver"},
-        {"y":0, "x":7, "pieceType":"white_knight"},
-        {"y":0, "x":8, "pieceType":"white_lance"},
-
-        {"y":1, "x":1, "pieceType":"white_rook"},
-        {"y":1, "x":7, "pieceType":"white_bishop"},
 
         {"y":2, "x":0, "pieceType":"white_pawn"},
         {"y":2, "x":1, "pieceType":"white_pawn"},
@@ -32,9 +23,18 @@
         {"y":6, "x":6, "pieceType":"black_pawn"},
         {"y":6, "x":7, "pieceType":"black_pawn"},
         {"y":6, "x":8, "pieceType":"black_pawn"},
+
+        {"y":7, "x":1, "pieceType":"black_bishop"},
+        {"y":7, "x":7, "pieceType":"black_rook"},
 
+        {"y":8, "x":0, "pieceType":"black_lance"},
+        {"y":8, "x":1, "pieceType":"black_knight"},
+        {"y":8, "x":2, "pieceType":"black_silver"},
         {"y":8, "x":3, "pieceType":"black_gold"},
         {"y":8, "x":4, "pieceType":"black_king"},
-        {"y":8, "x":5, "pieceType":"black_gold"}
+        {"y":8, "x":5, "pieceType":"black_gold"},
+        {"y":8, "x":6, "pieceType":"black_silver"},
+        {"y":8, "x":7, "pieceType":"black_knight"},
+        {"y":8, "x":8, "pieceType":"black_lance"}
     ]
 }
diff --git a/Assets/Resources/Data/board-drop-five.json b/Assets/Resources/Data/board-drop-five.json
@@ -1,17 +1,12 @@
 {
     "boardData" : [
-        {"y":0, "x":0, "pieceType":"white_lance"},
-        {"y":0, "x":1, "pieceType":"white_knight"},
         {"y":0, "x":2, "pieceType":"white_silver"},
         {"y":0, "x":3, "pieceType":"white_gold"},
         {"y":0, "x":4, "pieceType":"white_king"},
         {"y":0, "x":5, "pieceType":"white_gold"},
         {"y":0, "x":6, "pieceType":"white_silver"},
         {"y":0, "x":7, "pieceType":"white_knight"},
-        {"y":0, "x":8, "pieceType":"white_lance"},
 
-        {"y":1, "x":1, "pieceType":"white_rook"},
-        {"y":1, "x":7, "pieceType":"white_bishop"},
 
         {"y":2, "x":0, "pieceType":"white_pawn"},
         {"y":2, "x":1, "pieceType":"white_pawn"},
@@ -32,12 +27,18 @@
         {"y":6, "x":6, "pieceType":"black_pawn"},
         {"y":6, "x":7, "pieceType":"black_pawn"},
         {"y":6, "x":8, "pieceType":"black_pawn"},
+
+        {"y":7, "x":1, "pieceType":"black_bishop"},
+        {"y":7, "x":7, "pieceType":"black_rook"},
 
+        {"y":8, "x":0, "pieceType":"black_lance"},
+        {"y":8, "x":1, "pieceType":"black_knight"},
         {"y":8, "x":2, "pieceType":"black_silver"},
         {"y":8, "x":3, "pieceType":"black_gold"},
         {"y":8, "x":4, "pieceType":"black_king"},
         {"y":8, "x":5, "pieceType":"black_gold"},
         {"y":8, "x":6, "pieceType":"black_silver"},
-        {"y":8, "x":7, "pieceType":"black_knight"}
+        {"y":8, "x":7, "pieceType":"black_knight"},
+        {"y":8, "x":8, "pieceType":"black_lance"}
     ]
 }
diff --git a/Assets/Resources/Data/board-drop-four.json b/Assets/Resources/Data/board-drop-four.json
@@ -1,17 +1,12 @@
 {
     "boardData" : [
-        {"y":0, "x":0, "pieceType":"white_lance"},
         {"y":0, "x":1, "pieceType":"white_knight"},
         {"y":0, "x":2, "pieceType":"white_silver"},
         {"y":0, "x":3, "pieceType":"white_gold"},
         {"y":0, "x":4, "pieceType":"white_king"},
         {"y":0, "x":5, "pieceType":"white_gold"},
         {"y":0, "x":6, "pieceType":"white_silver"},
         {"y":0, "x":7, "pieceType":"white_knight"},
-        {"y":0, "x":8, "pieceType":"white_lance"},
-
-        {"y":1, "x":1, "pieceType":"white_rook"},
-        {"y":1, "x":7, "pieceType":"white_bishop"},
 
         {"y":2, "x":0, "pieceType":"white_pawn"},
         {"y":2, "x":1, "pieceType":"white_pawn"},
@@ -32,13 +27,18 @@
         {"y":6, "x":6, "pieceType":"black_pawn"},
         {"y":6, "x":7, "pieceType":"black_pawn"},
         {"y":6, "x":8, "pieceType":"black_pawn"},
+
+        {"y":7, "x":1, "pieceType":"black_bishop"},
+        {"y":7, "x":7, "pieceType":"black_rook"},
 
+        {"y":8, "x":0, "pieceType":"black_lance"},
         {"y":8, "x":1, "pieceType":"black_knight"},
         {"y":8, "x":2, "pieceType":"black_silver"},
         {"y":8, "x":3, "pieceType":"black_gold"},
         {"y":8, "x":4, "pieceType":"black_king"},
         {"y":8, "x":5, "pieceType":"black_gold"},
         {"y":8, "x":6, "pieceType":"black_silver"},
-        {"y":8, "x":7, "pieceType":"black_knight"}
+        {"y":8, "x":7, "pieceType":"black_knight"},
+        {"y":8, "x":8, "pieceType":"black_lance"}
     ]
 }
diff --git a/Assets/Resources/Data/board-drop-left-five.json b/Assets/Resources/Data/board-drop-left-five.json
@@ -1,17 +1,11 @@
 {
     "boardData" : [
-        {"y":0, "x":0, "pieceType":"white_lance"},
         {"y":0, "x":1, "pieceType":"white_knight"},
         {"y":0, "x":2, "pieceType":"white_silver"},
         {"y":0, "x":3, "pieceType":"white_gold"},
         {"y":0, "x":4, "pieceType":"white_king"},
         {"y":0, "x":5, "pieceType":"white_gold"},
         {"y":0, "x":6, "pieceType":"white_silver"},
-        {"y":0, "x":7, "pieceType":"white_knight"},
-        {"y":0, "x":8, "pieceType":"white_lance"},
-
-        {"y":1, "x":1, "pieceType":"white_rook"},
-        {"y":1, "x":7, "pieceType":"white_bishop"},
 
         {"y":2, "x":0, "pieceType":"white_pawn"},
         {"y":2, "x":1, "pieceType":"white_pawn"},
@@ -32,9 +26,14 @@
         {"y":6, "x":6, "pieceType":"black_pawn"},
         {"y":6, "x":7, "pieceType":"black_pawn"},
         {"y":6, "x":8, "pieceType":"black_pawn"},
-
+
+        {"y":7, "x":1, "pieceType":"black_bishop"},
         {"y":7, "x":7, "pieceType":"black_rook"},
 
+        {"y":8, "x":0, "pieceType":"black_lance"},
+        {"y":8, "x":1, "pieceType":"black_knight"},
+        {"y":8, "x":2, "pieceType":"black_silver"},
+        {"y":8, "x":3, "pieceType":"black_gold"},
         {"y":8, "x":4, "pieceType":"black_king"},
         {"y":8, "x":5, "pieceType":"black_gold"},
         {"y":8, "x":6, "pieceType":"black_silver"},

diff --git a/Assets/Resources/Data/board-drop-left-lance.json b/Assets/Resources/Data/board-drop-left-lance.json
@@ -8,7 +8,6 @@
         {"y":0, "x":5, "pieceType":"white_gold"},
         {"y":0, "x":6, "pieceType":"white_silver"},
         {"y":0, "x":7, "pieceType":"white_knight"},
-        {"y":0, "x":8, "pieceType":"white_lance"},
 
         {"y":1, "x":1, "pieceType":"white_rook"},
         {"y":1, "x":7, "pieceType":"white_bishop"},
@@ -36,6 +35,7 @@
         {"y":7, "x":1, "pieceType":"black_bishop"},
         {"y":7, "x":7, "pieceType":"black_rook"},
 
+        {"y":8, "x":0, "pieceType":"black_lance"},
         {"y":8, "x":1, "pieceType":"black_knight"},
         {"y":8, "x":2, "pieceType":"black_silver"},
         {"y":8, "x":3, "pieceType":"black_gold"},

diff --git a/Assets/Resources/Data/board-drop-right-lance.json b/Assets/Resources/Data/board-drop-right-lance.json
@@ -1,6 +1,5 @@
 {
     "boardData" : [
-        {"y":0, "x":0, "pieceType":"white_lance"},
         {"y":0, "x":1, "pieceType":"white_knight"},
         {"y":0, "x":2, "pieceType":"white_silver"},
         {"y":0, "x":3, "pieceType":"white_gold"},
@@ -43,6 +42,7 @@
         {"y":8, "x":4, "pieceType":"black_king"},
         {"y":8, "x":5, "pieceType":"black_gold"},
         {"y":8, "x":6, "pieceType":"black_silver"},
-        {"y":8, "x":7, "pieceType":"black_knight"}
+        {"y":8, "x":7, "pieceType":"black_knight"},
+        {"y":8, "x":8, "pieceType":"black_lance"}
     ]
 }
diff --git a/Assets/Resources/Data/board-drop-rook-lance.json b/Assets/Resources/Data/board-drop-rook-lance.json
@@ -8,9 +8,7 @@
         {"y":0, "x":5, "pieceType":"white_gold"},
         {"y":0, "x":6, "pieceType":"white_silver"},
         {"y":0, "x":7, "pieceType":"white_knight"},
-        {"y":0, "x":8, "pieceType":"white_lance"},
 
-        {"y":1, "x":1, "pieceType":"white_rook"},
         {"y":1, "x":7, "pieceType":"white_bishop"},
 
         {"y":2, "x":0, "pieceType":"white_pawn"},
@@ -34,7 +32,9 @@
         {"y":6, "x":8, "pieceType":"black_pawn"},
 
         {"y":7, "x":1, "pieceType":"black_bishop"},
+        {"y":7, "x":7, "pieceType":"black_rook"},
 
+        {"y":8, "x":0, "pieceType":"black_lance"},
         {"y":8, "x":1, "pieceType":"black_knight"},
         {"y":8, "x":2, "pieceType":"black_silver"},
         {"y":8, "x":3, "pieceType":"black_gold"},

diff --git a/Assets/Resources/Data/board-drop-rook.json b/Assets/Resources/Data/board-drop-rook.json
@@ -10,7 +10,6 @@
         {"y":0, "x":7, "pieceType":"white_knight"},
         {"y":0, "x":8, "pieceType":"white_lance"},
 
-        {"y":1, "x":1, "pieceType":"white_rook"},
         {"y":1, "x":7, "pieceType":"white_bishop"},
 
         {"y":2, "x":0, "pieceType":"white_pawn"},
@@ -34,6 +33,7 @@
         {"y":6, "x":8, "pieceType":"black_pawn"},
 
         {"y":7, "x":1, "pieceType":"black_bishop"},
+        {"y":7, "x":7, "pieceType":"black_rook"},
 
         {"y":8, "x":0, "pieceType":"black_lance"},
         {"y":8, "x":1, "pieceType":"black_knight"},

diff --git a/Assets/Resources/Data/board-drop-six.json b/Assets/Resources/Data/board-drop-six.json
@@ -1,17 +1,10 @@
 {
     "boardData" : [
-        {"y":0, "x":0, "pieceType":"white_lance"},
-        {"y":0, "x":1, "pieceType":"white_knight"},
         {"y":0, "x":2, "pieceType":"white_silver"},
         {"y":0, "x":3, "pieceType":"white_gold"},
         {"y":0, "x":4, "pieceType":"white_king"},
         {"y":0, "x":5, "pieceType":"white_gold"},
         {"y":0, "x":6, "pieceType":"white_silver"},
-        {"y":0, "x":7, "pieceType":"white_knight"},
-        {"y":0, "x":8, "pieceType":"white_lance"},
-
-        {"y":1, "x":1, "pieceType":"white_rook"},
-        {"y":1, "x":7, "pieceType":"white_bishop"},
 
         {"y":2, "x":0, "pieceType":"white_pawn"},
         {"y":2, "x":1, "pieceType":"white_pawn"},
@@ -32,11 +25,18 @@
         {"y":6, "x":6, "pieceType":"black_pawn"},
         {"y":6, "x":7, "pieceType":"black_pawn"},
         {"y":6, "x":8, "pieceType":"black_pawn"},
+
+        {"y":7, "x":1, "pieceType":"black_bishop"},
+        {"y":7, "x":7, "pieceType":"black_rook"},
 
+        {"y":8, "x":0, "pieceType":"black_lance"},
+        {"y":8, "x":1, "pieceType":"black_knight"},
         {"y":8, "x":2, "pieceType":"black_silver"},
         {"y":8, "x":3, "pieceType":"black_gold"},
         {"y":8, "x":4, "pieceType":"black_king"},
         {"y":8, "x":5, "pieceType":"black_gold"},
-        {"y":8, "x":6, "pieceType":"black_silver"}
+        {"y":8, "x":6, "pieceType":"black_silver"},
+        {"y":8, "x":7, "pieceType":"black_knight"},
+        {"y":8, "x":8, "pieceType":"black_lance"}
     ]
 }
diff --git a/Assets/Resources/Data/board-drop-ten.json b/Assets/Resources/Data/board-drop-ten.json
@@ -1,17 +1,6 @@
 {
     "boardData" : [
-        {"y":0, "x":0, "pieceType":"white_lance"},
-        {"y":0, "x":1, "pieceType":"white_knight"},
-        {"y":0, "x":2, "pieceType":"white_silver"},
-        {"y":0, "x":3, "pieceType":"white_gold"},
         {"y":0, "x":4, "pieceType":"white_king"},
-        {"y":0, "x":5, "pieceType":"white_gold"},
-        {"y":0, "x":6, "pieceType":"white_silver"},
-        {"y":0, "x":7, "pieceType":"white_knight"},
-        {"y":0, "x":8, "pieceType":"white_lance"},
-
-        {"y":1, "x":1, "pieceType":"white_rook"},
-        {"y":1, "x":7, "pieceType":"white_bishop"},
 
         {"y":2, "x":0, "pieceType":"white_pawn"},
         {"y":2, "x":1, "pieceType":"white_pawn"},
@@ -32,7 +21,18 @@
         {"y":6, "x":6, "pieceType":"black_pawn"},
         {"y":6, "x":7, "pieceType":"black_pawn"},
         {"y":6, "x":8, "pieceType":"black_pawn"},
+
+        {"y":7, "x":1, "pieceType":"black_bishop"},
+        {"y":7, "x":7, "pieceType":"black_rook"},
 
-        {"y":8, "x":4, "pieceType":"black_king"}
+        {"y":8, "x":0, "pieceType":"black_lance"},
+        {"y":8, "x":1, "pieceType":"black_knight"},
+        {"y":8, "x":2, "pieceType":"black_silver"},
+        {"y":8, "x":3, "pieceType":"black_gold"},
+        {"y":8, "x":4, "pieceType":"black_king"},
+        {"y":8, "x":5, "pieceType":"black_gold"},
+        {"y":8, "x":6, "pieceType":"black_silver"},
+        {"y":8, "x":7, "pieceType":"black_knight"},
+        {"y":8, "x":8, "pieceType":"black_lance"}
     ]
 }
diff --git a/Assets/Resources/Data/board-drop-three.json b/Assets/Resources/Data/board-drop-three.json
@@ -8,10 +8,6 @@
         {"y":0, "x":5, "pieceType":"white_gold"},
         {"y":0, "x":6, "pieceType":"white_silver"},
         {"y":0, "x":7, "pieceType":"white_knight"},
-        {"y":0, "x":8, "pieceType":"white_lance"},
-
-        {"y":1, "x":1, "pieceType":"white_rook"},
-        {"y":1, "x":7, "pieceType":"white_bishop"},
 
         {"y":2, "x":0, "pieceType":"white_pawn"},
         {"y":2, "x":1, "pieceType":"white_pawn"},
@@ -32,7 +28,11 @@
         {"y":6, "x":6, "pieceType":"black_pawn"},
         {"y":6, "x":7, "pieceType":"black_pawn"},
         {"y":6, "x":8, "pieceType":"black_pawn"},
+
+        {"y":7, "x":1, "pieceType":"black_bishop"},
+        {"y":7, "x":7, "pieceType":"black_rook"},
 
+        {"y":8, "x":0, "pieceType":"black_lance"},
         {"y":8, "x":1, "pieceType":"black_knight"},
         {"y":8, "x":2, "pieceType":"black_silver"},
         {"y":8, "x":3, "pieceType":"black_gold"},

diff --git a/Assets/Resources/Data/board-drop-two.json b/Assets/Resources/Data/board-drop-two.json
@@ -10,9 +10,6 @@
         {"y":0, "x":7, "pieceType":"white_knight"},
         {"y":0, "x":8, "pieceType":"white_lance"},
 
-        {"y":1, "x":1, "pieceType":"white_rook"},
-        {"y":1, "x":7, "pieceType":"white_bishop"},
-
         {"y":2, "x":0, "pieceType":"white_pawn"},
         {"y":2, "x":1, "pieceType":"white_pawn"},
         {"y":2, "x":2, "pieceType":"white_pawn"},
@@ -32,6 +29,9 @@
         {"y":6, "x":6, "pieceType":"black_pawn"},
         {"y":6, "x":7, "pieceType":"black_pawn"},
         {"y":6, "x":8, "pieceType":"black_pawn"},
+
+        {"y":7, "x":1, "pieceType":"black_bishop"},
+        {"y":7, "x":7, "pieceType":"black_rook"},
 
         {"y":8, "x":0, "pieceType":"black_lance"},
         {"y":8, "x":1, "pieceType":"black_knight"},