update from gsf repo

super-unprofessional-league · Nov 10, 2023 · fb42c96 · fb42c96
1 parent 7ec12ba
commit fb42c96
Show file tree

Hide file tree

Showing 54 changed files with 1,923 additions and 995 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ By shrekshao狄学长
 
 [示例](https://super-unprofessional-league.github.io/soccer-website-generator/)
 
-一个基于Jekyll的静态网站生成器，转为建造超业余足球联赛网站定制，适用于校园内赛事，社区联赛等。 
+一个基于Jekyll的静态网站生成器，专为建造超业余足球联赛网站定制，适用于校园内赛事，社区联赛等。 
 
 ![](docs/tournament-page.png)
 
@@ -55,7 +55,7 @@ By shrekshao狄学长
 
 所有比赛相关数据在 `_data/` 目录下
 
-所有静态文件（照片等）置于 `assets` 目录下
+所有静态文件（照片等）置于 `assets/` 目录下
 
 ### _data 数据结构示例
 
@@ -168,11 +168,13 @@ By shrekshao狄学长
 
 ### config.json 联赛设置
 
+* 小组赛+淘汰赛 赛季例子
+
 ```json
 {
   "display_name": "健雄杯2013",
   "type": "group + knockout",
-  "group_stage": {
+  "groups": {
     "A": [
       "613111",
       "610122",
@@ -186,34 +188,77 @@ By shrekshao狄学长
       "610112"
     ]
   },
-  "knockout_stage": [
-    [
-      ["610131", "610111", "2013-10-21-1"],
-
-      ["613111", "610112", "2013-10-20-1"],
+  "knockouts": {
+    "淘汰赛阶段": {
+      "bracket": [
+        [
+          ["610131", "610111", "2013-10-21-1"],
+
+          ["613111", "610112", "2013-10-20-1"],
 
-      ["613131", "611131", ""],
+          ["613131", "611131", ""],
 
-      ["610132", "611111", "2013-10-15-1"]
-    ],
-    [
-      ["610111", "613111", "2013-11-14-1"],
-
-      ["611131", "610132", "2013-11-15-1"]
-    ],
-    [
-      ["613111","611131", "2013-11-17-1"]
-    ]
-  ],
+          ["610132", "611111", "2013-10-15-1"]
+        ],
+        [
+          ["610111", "613111", "2013-11-14-1"],
+
+          ["611131", "610132", "2013-11-15-1"]
+        ],
+        [
+          ["613111","611131", "2013-11-17-1"]
+        ]
+      ]
+    }
+  },
   "winner": "613111",
   "rules": "*大一球队直接进入淘汰赛\n*各小组前两名出线"
 }
 ```
 
+* 多级联赛 赛季例子
+
+```json
+{
+  "display_name_zh": "23-24 11人制",
+  "display_name": "23-24 11v11",
+  "description": "NCCSF 2023秋-2024春 11人制联赛",
+  "type": "division",
+  "rules": "*11人制\n*分为两个Division\n*Division内双循环",
+  "divisions": {
+    "D1": [
+      "CalBlue",
+      "EBU",
+      "GSF-U",
+      "ICP",
+      "OverPower",
+      "Shoreline",
+      "SVTigers",
+      "WU"
+    ],
+    "D2": [
+      "DeepSoccer",
+      "Wolf",
+      "GSF-L",
+      "HeHe",
+      "Hunters",
+      "JTU",
+      "OX9",
+      "SouthBayKnight",
+      "THU"
+    ]
+  }
+}
+```
+
 * 若无此文件则赛季默认为联赛
 * `type`
-    - `league`
+    - `league_table`：最简单的联赛积分表
     - `group + knockout`
+        - 提供 `"groups", "knockouts"` 信息（例子如上）
+    - `division` 多个division（甲级，乙级）积分表
+        - 提供 `division` 信息（例子如上）
+    - `region`：完全排序对阵（一组N支队伍，N=log2(M)，共进行2^N - 1轮比赛。第一轮胜者积2^N分，第二轮胜者积2^(N-1)分，……，地2^N - 1轮胜者积1分
 * 若为 `group + knockout`
     * `group_stage` 为 `小组名` => `队伍文件名（无后缀）`
     * `knockout_stage`每个数组轮次为2的幂次递减，... 16, 8, 4, 2, 1

diff --git a/_config.yml b/_config.yml
@@ -22,7 +22,7 @@ baseurl: "/soccer-website-generator" # the subpath of your site, e.g. /blog
 url: "" # the base hostname & protocol for your site, e.g. http://example.com
 lang: zh
 languages: ["zh"]
-exclude_from_localizations: ["_posts", javascript", "images", "css"]
+exclude_from_localizations: ["_posts", "assets", "docs", "scripts", "_sass"]
 
 # Build settings
 markdown: kramdown
@@ -47,6 +47,10 @@ exclude:
   - vendor/gems/
   - vendor/ruby/
   - docs/
+  - bundle/
+  - cache/
+  - gems/
+  - ruby/
 
 tag_page_layout: tag_page
 tag_page_dir: tag

diff --git a/_data/seasons/2011/config.json b/_data/seasons/2011/config.json
@@ -2,24 +2,28 @@
   "display_name": "11赛季",
   "description": "淘汰赛赛季示例",
   "type": "group + knockout",
-  "knockout_stage": [
-    [
-      ["610092", "", ""],
-
-      ["", "", ""],
-
-      ["", "", ""],
-
-      ["613111", "610111", "4"]
-    ],
-    [
-      ["610092", "611101", "1"],
-
-      ["610101", "613111", "2"]
-    ],
-    [
-      ["610092","613111", "final"]
+  "knockouts": {
+    "淘汰赛阶段": {
+    "bracket": [
+      [
+        ["610092", "", ""],
+
+        ["", "", ""],
+
+        ["", "", ""],
+
+        ["613111", "610111", "4"]
+      ],
+      [
+        ["610092", "611101", "1"],
+
+        ["610101", "613111", "2"]
+      ],
+      [
+        ["610092","613111", "final"]
+      ]
     ]
-  ],
+    }
+  },
   "winner": "610092"
 }
diff --git a/_data/seasons/2011/games/2.json b/_data/seasons/2011/games/2.json
@@ -15,5 +15,5 @@
         "events": [
         ]
     },
-    "extra": "(点球 0:3)"
+    "penalty": [0, 3]
 }
diff --git a/_data/seasons/2012/config.json b/_data/seasons/2012/config.json
@@ -1,7 +1,7 @@
 {
   "display_name": "12赛季",
   "description": "联赛赛季示例",
-  "type": "league",
+  "type": "league_table",
   "winner": "611101",
   "rules": "这里可以写一些赛事分组，晋级等的规则"
 }
diff --git a/_data/seasons/2013/config.json b/_data/seasons/2013/config.json
@@ -2,7 +2,7 @@
   "display_name": "13赛季",
   "description": "健雄杯2013赛季。吴院班级大三之后将打散进入各专业，所以对11级来说这是他们的最后一届健雄杯。\n小组赛+淘汰赛示例",
   "type": "group + knockout",
-  "group_stage": {
+  "groups": {
     "A": [
       "613111",
       "610122",
@@ -16,25 +16,29 @@
       "610112"
     ]
   },
-  "knockout_stage": [
-    [
-      ["610131", "610111", "2013-10-21-1"],
-
-      ["613111", "610112", "2013-10-20-1"],
+  "knockouts": {
+    "淘汰赛阶段": {
+      "bracket": [
+        [
+          ["610131", "610111", "2013-10-21-1"],
+
+          ["613111", "610112", "2013-10-20-1"],
 
-      ["613131", "611131", ""],
+          ["613131", "611131", ""],
 
-      ["610132", "611111", "2013-10-15-1"]
-    ],
-    [
-      ["610111", "613111", "2013-11-14-1"],
-
-      ["611131", "610132", "2013-11-15-1"]
-    ],
-    [
-      ["613111","611131", "2013-11-17-1"]
-    ]
-  ],
+          ["610132", "611111", "2013-10-15-1"]
+        ],
+        [
+          ["610111", "613111", "2013-11-14-1"],
+
+          ["611131", "610132", "2013-11-15-1"]
+        ],
+        [
+          ["613111","611131", "2013-11-17-1"]
+        ]
+      ]
+    }
+  },
   "winner": "613111",
   "rules": "*大一球队直接进入淘汰赛\n*各小组前两名出线"
 }
diff --git a/_i18n/en.yml b/_i18n/en.yml
@@ -1,23 +1,41 @@
+global:
+  en: English
+  zh: 中文
+  ja: 日本語
 posts_title: Posts
 schedule: Schedule
 goal_scorers: Goal Scorers
+assist_list: Assists
 season: Season
 season_list: All Seasons
+league_website: League Website
 player:
-  photo: Pic
+  photo: Photo
   name: Name
   team: Team
   goals_penalty: |
     Goals
     (Penalty)
+  assists_penalty: |
+    Assists
+    (Penalty Makes)
   number: No.
   position: Position
   goals: Goals
+  assists: Assists
+门将: GK
+后卫: DF
+中场: MF
+前锋: FW
 champion: Champion
 knockout_stage: Knockout Stage
 group_stage: Group Stage
 rank_stage: Ranking Stage
+qualify_stage: Qualifying Stage
+open_group: Open Group Complete Ranking
+yzb_group: Courage Cup Ranking
 games_list: Games
+penalty: Penalty
 table:
   team_name: Team
   played: Played
@@ -45,13 +63,17 @@ games:
   rank-r1: Ranking Round 1
   rank-r2: Ranking Round 2
   rank-r3: Ranking Round 3
+  rank-r4: Ranking Round 4
+  rank-r5: Ranking Round 5
+  rank-r6: Ranking Round 6
   group: Group
   group-r1: Group Round 1
   group-r2: Group Round 2
   group-r3: Group Round 3
   group-r4: Group Round 4
   group-r5: Group Round 5
   group-r6: Group Round 6
+  qualify: Qualifier
   league: League
   '#1': Round 1
   '#2': Round 2
@@ -72,4 +94,6 @@ games:
   '#17': Round 17
   '#18': Round 18
   '#19': Round 19
-  '#20': Round 20
+  '#20': Round 20
+  '#21': Round 21
+  '#22': Round 22