Commit 44af210f authored by nanahira's avatar nanahira

Merge branch 'mc'

parents 8302930d a88f32ab
...@@ -269,6 +269,14 @@ ...@@ -269,6 +269,14 @@
"LINK_MARKER_TOP": 128, "LINK_MARKER_TOP": 128,
"LINK_MARKER_TOP_RIGHT": 256 "LINK_MARKER_TOP_RIGHT": 256
}, },
"DUEL_STAGE": {
"BEGIN": 0,
"FINGER": 1,
"FIRSTGO": 2,
"DUELING": 3,
"SIDING": 4,
"END": 5
},
"COLORS": { "COLORS": {
"LIGHTBLUE": 8, "LIGHTBLUE": 8,
"RED": 11, "RED": 11,
...@@ -282,6 +290,3 @@ ...@@ -282,6 +290,3 @@
"DARKGRAY": 19 "DARKGRAY": 19
} }
} }
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment