diff --git a/chapters_cn/0_defines.adoc b/chapters_cn/0_defines.adoc index e687667..f04419e 100644 --- a/chapters_cn/0_defines.adoc +++ b/chapters_cn/0_defines.adoc @@ -1,10 +1,10 @@ -:year: 2023 +:year: 2024 :title: RoboCup中国公开赛小型组{year}年规则 :header_left: RoboCup中国公开赛小型组{year}年规则 :header_right: 小型足球机器人规则 :scripts: cjk -:param_robot_count: 8 +:param_robot_count: 11 :param_pitch_length: 12 :param_pitch_width: 9 :param_pitch_margin: 0.7 @@ -13,9 +13,9 @@ :param_pitch_length_with_margin: 13.4 // pitch_width_with_margin = pitch_width + 2*pitch_margin :param_pitch_width_with_margin: 10.4 -:param_penalty_length: 2.4 -:param_penalty_width: 1.2 +:param_penalty_length: 3.6 +:param_penalty_width: 1.8 // penelty_dist = pitch_length*2/3 -:param_penelty_dist: 8 -:image_field_demensions: quad-size-field.png -:image_goal_detail: goal_detail_divisionA.png \ No newline at end of file +:param_penalty_dist: 8 +:image_field_demensions: quad-size-field11vs11.png +:image_goal_detail: goal_detail_divisionA11vs11.png \ No newline at end of file diff --git a/chapters_cn/0_defines_zj.adoc b/chapters_cn/0_defines_zj.adoc new file mode 100644 index 0000000..d7bb0ec --- /dev/null +++ b/chapters_cn/0_defines_zj.adoc @@ -0,0 +1,21 @@ +:year: 2024 +:title: 2024年第八届浙江省大学生机器人竞赛-小型足球机器人 +:header_left: 2024年第八届浙江省大学生机器人竞赛 +:header_right: 小型足球机器人团体对抗赛规则 +:scripts: cjk + +:param_robot_count: 6 +:param_pitch_length: 9 +:param_pitch_width: 6 +:param_pitch_margin: 0.7 +:param_pitch_margin_outside: 0.4 +// pitch_length_with_margin = pitch_length + 2*pitch_margin +:param_pitch_length_with_margin: 10.4 +// pitch_width_with_margin = pitch_width + 2*pitch_margin +:param_pitch_width_with_margin: 7.4 +:param_penalty_length: 2.0 +:param_penalty_width: 1.0 +// penelty_dist = pitch_length*2/3 +:param_penelty_dist: 6 +:image_field_demensions: double-size-field.png +:image_goal_detail: goal_detail_divisionB.png \ No newline at end of file diff --git a/images/goal_detail_divisionA11vs11.png b/images/goal_detail_divisionA11vs11.png new file mode 100644 index 0000000..2a643ea Binary files /dev/null and b/images/goal_detail_divisionA11vs11.png differ diff --git a/images/goal_detail_divisionA11vs11.svg b/images/goal_detail_divisionA11vs11.svg new file mode 100644 index 0000000..83a2d0f --- /dev/null +++ b/images/goal_detail_divisionA11vs11.svg @@ -0,0 +1,394 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + 20 + 180 + 10 + 20 + + 1800 + + diff --git a/images/quad-size-field.svg b/images/quad-size-field.svg index 2b24112..9880db3 100644 --- a/images/quad-size-field.svg +++ b/images/quad-size-field.svg @@ -15,8 +15,8 @@ height="10402.144" id="svg3081" version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="quad-size-field.svg" + inkscape:version="0.92.4 (f8dce91, 2019-08-02)" + sodipodi:docname="field.svg" inkscape:export-filename="/Users/masa-ito/Dropbox/aichi-pu2/robocup/robocup18/ssl-rules/img/quad-size-field.png" inkscape:export-xdpi="11.415141" inkscape:export-ydpi="11.415141"> @@ -503,13 +503,13 @@ + y2="2591.6892" /> + fit-margin-bottom="0" + inkscape:snap-bbox="true" /> @@ -551,23 +552,24 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-2.1154376,9352.6377)"> + transform="translate(-2.1154376,9352.6377)" + style="display:inline"> + x="7.1788087" + y="-9354.1143" /> + width="12583.396" + height="9599.9941" + x="429.41302" + y="-8952.6348" /> + transform="matrix(1,0,0,1.7884616,15,572.56051)" + style="opacity:0.58499995"> + style="fill:#0000ff;fill-opacity:1;stroke:none" /> + style="fill:#0000ff;fill-opacity:1;stroke:none" /> + style="fill:#0000ff;fill-opacity:1;stroke:none" /> + transform="matrix(1,0,0,1.7884616,3025,572.56041)"> + style="fill:#0000ff;fill-opacity:1;stroke:none" /> + style="fill:#0000ff;fill-opacity:1;stroke:none" /> + style="fill:#0000ff;fill-opacity:1;stroke:none" /> 13400 10400 + x="6130.9062" + y="316.50391" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:250px;line-height:1.25;font-family:Verdana;-inkscape-font-specification:Verdana">10400 12000 + style="font-size:250px;line-height:1.25">12000 9000 + style="font-size:250px;line-height:1.25">9000 2400 + style="font-size:200px;line-height:1.25">3600 1200 + y="-5461.084" + style="font-size:200px;line-height:1.25">1800 10 + style="font-size:250px;line-height:1.25">10 300 + style="font-size:200px;line-height:1.25">300 700 + style="font-size:200px;line-height:1.25">700 1000 - - - - + y="-4249.0815" + style="font-size:200px;line-height:3.45000005">1000 1200 + x="582.64917" + y="-4384.8379" + style="font-size:200px;line-height:1.25" + id="tspan142">1800 + + + + + + + + + + + + + diff --git a/images/quad-size-field11vs11.png b/images/quad-size-field11vs11.png new file mode 100644 index 0000000..8e39479 Binary files /dev/null and b/images/quad-size-field11vs11.png differ diff --git a/images/quad-size-field.png b/images/quad-size-field8vs8.png similarity index 100% rename from images/quad-size-field.png rename to images/quad-size-field8vs8.png diff --git a/sslrules_cn.adoc b/sslrules_cn.adoc index 7ff9e3a..bb11d00 100644 --- a/sslrules_cn.adoc +++ b/sslrules_cn.adoc @@ -5,6 +5,7 @@ include::chapters_cn/0_defines.adoc[] = {title} {docdate} :toc: +:toc-title: 目录 // add icons from fontawesome in a up-to-date version // ifdef::basebackend-html[]