试一试

FunnyArenaPixel · Jul 11, 2022 · 5338bda · 5338bda
1 parent eea2beb
commit 5338bda
Show file tree

Hide file tree

Showing 15 changed files with 52 additions and 40 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -1,15 +1,5 @@
 name: docs
 
-<<<<<<< HEAD
-    - name: vuepress-deploy
-      uses: jenkey2011/vuepress-deploy@master
-      env:
-        ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
-        TARGET_BRANCH: gh-pages
-        BUILD_SCRIPT: yarn && yarn docs:build
-        BUILD_DIR: docs/.vuepress/dist
-        CNAME: https://docs.fapixel.com
-=======
 on:
   # 每当 push 到 main 分支时触发部署
   push:
@@ -64,5 +54,4 @@ jobs:
           build_dir: docs/.vuepress/dist
         env:
           # @see https://docs.github.com/cn/actions/reference/authentication-in-a-workflow#about-the-github_token-secret
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
->>>>>>> parent of 7d9e9e2 (更新部署)
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 'node_modules' 
 '.temp' 
-'.cache' 
+'.cache' 
diff --git a/docs/.vuepress/.temp/internal/pagesComponents.js b/docs/.vuepress/.temp/internal/pagesComponents.js
@@ -13,10 +13,10 @@ export const pagesComponents = {
   "v-08eb506c": defineAsyncComponent(() => import(/* webpackChunkName: "v-08eb506c" */"F:/FillAmeaPixel/docs/docs/docs/.vuepress/.temp/pages/privacy.html.vue")),
   // path: /
   "v-8daa1a0e": defineAsyncComponent(() => import(/* webpackChunkName: "v-8daa1a0e" */"F:/FillAmeaPixel/docs/docs/docs/.vuepress/.temp/pages/index.html.vue")),
-  // path: /en/
-  "v-2d0a870d": defineAsyncComponent(() => import(/* webpackChunkName: "v-2d0a870d" */"F:/FillAmeaPixel/docs/docs/docs/.vuepress/.temp/pages/en/index.html.vue")),
   // path: /copyright/
   "v-640155fe": defineAsyncComponent(() => import(/* webpackChunkName: "v-640155fe" */"F:/FillAmeaPixel/docs/docs/docs/.vuepress/.temp/pages/copyright/index.html.vue")),
+  // path: /en/
+  "v-2d0a870d": defineAsyncComponent(() => import(/* webpackChunkName: "v-2d0a870d" */"F:/FillAmeaPixel/docs/docs/docs/.vuepress/.temp/pages/en/index.html.vue")),
   // path: /environment/
   "v-f5f35416": defineAsyncComponent(() => import(/* webpackChunkName: "v-f5f35416" */"F:/FillAmeaPixel/docs/docs/docs/.vuepress/.temp/pages/environment/index.html.vue")),
   // path: /team/leadership.html

diff --git a/docs/.vuepress/.temp/internal/pagesData.js b/docs/.vuepress/.temp/internal/pagesData.js
@@ -11,10 +11,10 @@ export const pagesData = {
   "v-08eb506c": () => import(/* webpackChunkName: "v-08eb506c" */"F:/FillAmeaPixel/docs/docs/docs/.vuepress/.temp/pages/privacy.html.js").then(({ data }) => data),
   // path: /
   "v-8daa1a0e": () => import(/* webpackChunkName: "v-8daa1a0e" */"F:/FillAmeaPixel/docs/docs/docs/.vuepress/.temp/pages/index.html.js").then(({ data }) => data),
-  // path: /en/
-  "v-2d0a870d": () => import(/* webpackChunkName: "v-2d0a870d" */"F:/FillAmeaPixel/docs/docs/docs/.vuepress/.temp/pages/en/index.html.js").then(({ data }) => data),
   // path: /copyright/
   "v-640155fe": () => import(/* webpackChunkName: "v-640155fe" */"F:/FillAmeaPixel/docs/docs/docs/.vuepress/.temp/pages/copyright/index.html.js").then(({ data }) => data),
+  // path: /en/
+  "v-2d0a870d": () => import(/* webpackChunkName: "v-2d0a870d" */"F:/FillAmeaPixel/docs/docs/docs/.vuepress/.temp/pages/en/index.html.js").then(({ data }) => data),
   // path: /environment/
   "v-f5f35416": () => import(/* webpackChunkName: "v-f5f35416" */"F:/FillAmeaPixel/docs/docs/docs/.vuepress/.temp/pages/environment/index.html.js").then(({ data }) => data),
   // path: /team/leadership.html

diff --git a/docs/.vuepress/.temp/internal/pagesRoutes.js b/docs/.vuepress/.temp/internal/pagesRoutes.js
@@ -7,8 +7,8 @@ const routeItems = [
   ["v-788856df","/players_covenant.html",{"title":"FillAmeaPixel 玩家公约"},["/players_covenant","/players_covenant.md"]],
   ["v-08eb506c","/privacy.html",{"title":"FillAmeaPixel 隐私政策"},["/privacy","/privacy.md"]],
   ["v-8daa1a0e","/",{"title":""},["/index.html","/README.md"]],
-  ["v-2d0a870d","/en/",{"title":""},["/en/index.html","/en/README.md"]],
   ["v-640155fe","/copyright/",{"title":"版权"},["/copyright/index.html","/copyright/README.md"]],
+  ["v-2d0a870d","/en/",{"title":""},["/en/index.html","/en/README.md"]],
   ["v-f5f35416","/environment/",{"title":"环境责任"},["/environment/index.html","/environment/README.md"]],
   ["v-4105bc0a","/team/leadership.html",{"title":"管理层"},["/team/leadership","/team/leadership.md"]],
   ["v-7b97ae72","/team/main.html",{"title":"FillAmeaPixel 团队总纲"},["/team/main","/team/main.md"]],

diff --git a/docs/.vuepress/.temp/internal/searchIndex.js b/docs/.vuepress/.temp/internal/searchIndex.js
@@ -138,17 +138,17 @@ export const searchIndex = [
     "extraFields": []
   },
   {
-    "title": "",
+    "title": "版权",
     "headers": [],
-    "path": "/en/",
-    "pathLocale": "/en/",
+    "path": "/copyright/",
+    "pathLocale": "/",
     "extraFields": []
   },
   {
     "title": "",
     "headers": [],
-    "path": "/copyright/",
-    "pathLocale": "/",
+    "path": "/en/",
+    "pathLocale": "/en/",
     "extraFields": []
   },
   {

diff --git a/docs/.vuepress/.temp/pages/copyright/assets/index.html.js b/docs/.vuepress/.temp/pages/copyright/assets/index.html.js
@@ -26,8 +26,14 @@ export const data = {
     }
   ],
   "git": {
-    "updatedTime": null,
-    "contributors": []
+    "updatedTime": 1657466749000,
+    "contributors": [
+      {
+        "name": "PexEric",
+        "email": "3088364720@qq.com",
+        "commits": 1
+      }
+    ]
   },
   "filePathRelative": "copyright/assets/README.md"
 }

diff --git a/docs/.vuepress/.temp/pages/copyright/index.html.js b/docs/.vuepress/.temp/pages/copyright/index.html.js
@@ -7,12 +7,12 @@ export const data = {
   "excerpt": "",
   "headers": [],
   "git": {
-    "updatedTime": 1649257829000,
+    "updatedTime": 1657466749000,
     "contributors": [
       {
         "name": "PexEric",
         "email": "3088364720@qq.com",
-        "commits": 1
+        "commits": 2
       }
     ]
   },

diff --git a/docs/.vuepress/.temp/pages/eula-changelog.html.js b/docs/.vuepress/.temp/pages/eula-changelog.html.js
@@ -20,8 +20,14 @@ export const data = {
     }
   ],
   "git": {
-    "updatedTime": null,
-    "contributors": []
+    "updatedTime": 1657466749000,
+    "contributors": [
+      {
+        "name": "PexEric",
+        "email": "3088364720@qq.com",
+        "commits": 1
+      }
+    ]
   },
   "filePathRelative": "eula-changelog.md"
 }

diff --git a/docs/.vuepress/.temp/pages/eula.html.js b/docs/.vuepress/.temp/pages/eula.html.js
@@ -57,12 +57,12 @@ export const data = {
     }
   ],
   "git": {
-    "updatedTime": 1649071134000,
+    "updatedTime": 1657466749000,
     "contributors": [
       {
         "name": "PexEric",
         "email": "3088364720@qq.com",
-        "commits": 1
+        "commits": 2
       }
     ]
   },

diff --git a/docs/.vuepress/.temp/pages/index.html.js b/docs/.vuepress/.temp/pages/index.html.js
@@ -26,12 +26,12 @@ export const data = {
   "excerpt": "",
   "headers": [],
   "git": {
-    "updatedTime": 1651924599000,
+    "updatedTime": 1657466749000,
     "contributors": [
       {
         "name": "PexEric",
         "email": "3088364720@qq.com",
-        "commits": 6
+        "commits": 7
       }
     ]
   },

diff --git a/docs/.vuepress/.temp/pages/team/leadership.html.js b/docs/.vuepress/.temp/pages/team/leadership.html.js
@@ -7,8 +7,14 @@ export const data = {
   "excerpt": "",
   "headers": [],
   "git": {
-    "updatedTime": null,
-    "contributors": []
+    "updatedTime": 1657466749000,
+    "contributors": [
+      {
+        "name": "PexEric",
+        "email": "3088364720@qq.com",
+        "commits": 1
+      }
+    ]
   },
   "filePathRelative": "team/leadership.md"
 }

diff --git a/docs/.vuepress/.temp/pages/team/leadership.html.vue b/docs/.vuepress/.temp/pages/team/leadership.html.vue
@@ -4,7 +4,7 @@
   <tr>
     <td align="center"><a href="https://space.bilibili.com/280664902/"><img src="https://www.minebbs.com/data/avatars/h/3/3011.jpg?1588671586" width="100px;" alt="PexEric"/><br /><sub><b>从不咕咕的鸽纸</b></sub></a><br /><small>服主</small><br /><a href="/" title="运维">🛠️</a><a href="mailto:3349525227@qq.com" title="邮箱">📫</a></td>
     <td align="center"><a href="https://space.bilibili.com/397162567"><img src="https://www.minebbs.com/data/avatars/h/1/1726.jpg?1644213938" width="100px;" alt="Catrainbow"/><br /><sub><b>Catrainbow</b></sub></a><br /><small>开发组长</small><br /><a href="https://github.com/rainbow188" title="开发">💻</a><a href="mailto:1602401265@qq.com" title="邮箱">📫</a></td>
-    <td align="center"><a href="https://space.bilibili.com/349401599/"><img src="https://s1.ax1x.com/2022/07/10/jy3NR0.jpg" width="100px;" alt="苏打"/><br /><sub><b>PexEric</b></sub></a><br /><small>运维组长</small><br /><a href="/" title="运维">🛠️</a><a href="/" title="人事管理">🧑‍🤝‍🧑</a><a href="mailto:42402007@qq.com" title="邮箱">📫</a></td>
+    <td align="center"><a href="https://space.bilibili.com/349401599/"><img src="https://s1.ax1x.com/2022/07/10/jy3NR0.jpg" width="100px;" alt="苏打"/><br /><sub><b>苏打</b></sub></a><br /><small>运维组长</small><br /><a href="/" title="运维">🛠️</a><a href="/" title="人事管理">🧑‍🤝‍🧑</a><a href="mailto:42402007@qq.com" title="邮箱">📫</a></td>
     <td align="center"><a href="https://pexeric.gitee.io/"><img src="https://pexeric.gitee.io/img/avatar.png" width="100px;" alt="PexEric"/><br /><sub><b>PexEric</b></sub></a><br /><small>策划组长</small><br /><a href="/" title="策划">📖</a><a href="/" title="服务器资源包、宣传图制作">🎨</a><a href="mailto:suoerix@gmail.com" title="邮箱">📫</a></td>
   </tr>
 </table>

diff --git a/docs/.vuepress/.temp/pages/team/main.html.js b/docs/.vuepress/.temp/pages/team/main.html.js
@@ -7,8 +7,14 @@ export const data = {
   "excerpt": "",
   "headers": [],
   "git": {
-    "updatedTime": null,
-    "contributors": []
+    "updatedTime": 1657466749000,
+    "contributors": [
+      {
+        "name": "PexEric",
+        "email": "3088364720@qq.com",
+        "commits": 1
+      }
+    ]
   },
   "filePathRelative": "team/main.md"
 }

diff --git a/docs/team/leadership.md b/docs/team/leadership.md
@@ -6,12 +6,11 @@
   <tr>
     <td align="center"><a href="https://space.bilibili.com/280664902/"><img src="https://www.minebbs.com/data/avatars/h/3/3011.jpg?1588671586" width="100px;" alt="PexEric"/><br /><sub><b>从不咕咕的鸽纸</b></sub></a><br /><small>服主</small><br /><a href="/" title="运维">🛠️</a><a href="mailto:3349525227@qq.com" title="邮箱">📫</a></td>
     <td align="center"><a href="https://space.bilibili.com/397162567"><img src="https://www.minebbs.com/data/avatars/h/1/1726.jpg?1644213938" width="100px;" alt="Catrainbow"/><br /><sub><b>Catrainbow</b></sub></a><br /><small>开发组长</small><br /><a href="https://github.com/rainbow188" title="开发">💻</a><a href="mailto:1602401265@qq.com" title="邮箱">📫</a></td>
-    <td align="center"><a href="https://space.bilibili.com/349401599/"><img src="https://s1.ax1x.com/2022/07/10/jy3NR0.jpg" width="100px;" alt="苏打"/><br /><sub><b>PexEric</b></sub></a><br /><small>运维组长</small><br /><a href="/" title="运维">🛠️</a><a href="/" title="人事管理">🧑‍🤝‍🧑</a><a href="mailto:42402007@qq.com" title="邮箱">📫</a></td>
+    <td align="center"><a href="https://space.bilibili.com/349401599/"><img src="https://s1.ax1x.com/2022/07/10/jy3NR0.jpg" width="100px;" alt="苏打"/><br /><sub><b>苏打</b></sub></a><br /><small>运维组长</small><br /><a href="/" title="运维">🛠️</a><a href="/" title="人事管理">🧑‍🤝‍🧑</a><a href="mailto:42402007@qq.com" title="邮箱">📫</a></td>
     <td align="center"><a href="https://pexeric.gitee.io/"><img src="https://pexeric.gitee.io/img/avatar.png" width="100px;" alt="PexEric"/><br /><sub><b>PexEric</b></sub></a><br /><small>策划组长</small><br /><a href="/" title="策划">📖</a><a href="/" title="服务器资源包、宣传图制作">🎨</a><a href="mailto:suoerix@gmail.com" title="邮箱">📫</a></td>
 
   </tr>
 </table>
 
 如果您有任何疑问，欢迎与我们[取得联系](mailto:admin@fapixel.com)。
 
-