From 5338bdad35179972fe0dc041509225586243d9bb Mon Sep 17 00:00:00 2001
From: PexEric <3088364720@qq.com>
Date: Mon, 11 Jul 2022 11:40:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E4=B8=80=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.github/workflows/docs.yml | 13 +------------
.gitignore | 2 +-
docs/.vuepress/.temp/internal/pagesComponents.js | 4 ++--
docs/.vuepress/.temp/internal/pagesData.js | 4 ++--
docs/.vuepress/.temp/internal/pagesRoutes.js | 2 +-
docs/.vuepress/.temp/internal/searchIndex.js | 10 +++++-----
.../.temp/pages/copyright/assets/index.html.js | 10 ++++++++--
docs/.vuepress/.temp/pages/copyright/index.html.js | 4 ++--
docs/.vuepress/.temp/pages/eula-changelog.html.js | 10 ++++++++--
docs/.vuepress/.temp/pages/eula.html.js | 4 ++--
docs/.vuepress/.temp/pages/index.html.js | 4 ++--
docs/.vuepress/.temp/pages/team/leadership.html.js | 10 ++++++++--
docs/.vuepress/.temp/pages/team/leadership.html.vue | 2 +-
docs/.vuepress/.temp/pages/team/main.html.js | 10 ++++++++--
docs/team/leadership.md | 3 +--
15 files changed, 52 insertions(+), 40 deletions(-)
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 6c9b1dc1..5373ee90 100644
--- 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 }}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 943d92ef..5dfe4321 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
'node_modules'
'.temp'
-'.cache'
+'.cache'
\ No newline at end of file
diff --git a/docs/.vuepress/.temp/internal/pagesComponents.js b/docs/.vuepress/.temp/internal/pagesComponents.js
index bf43409a..731f9de1 100644
--- 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
index a2f1bdcb..f0469063 100644
--- 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
index 210fd1f1..99b53922 100644
--- 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
index 5ba6bbb8..cd1f1b7c 100644
--- 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
index e21ddf74..a8465736 100644
--- 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
index 074a3418..700b22e7 100644
--- 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
index 23ff9c2b..bd61092a 100644
--- 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
index fe4c9562..7cfd506d 100644
--- 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
index 7daba069..ae8fea07 100644
--- 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
index b482f432..ec40e805 100644
--- 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
index 1ad8e701..4fab7579 100644
--- a/docs/.vuepress/.temp/pages/team/leadership.html.vue
+++ b/docs/.vuepress/.temp/pages/team/leadership.html.vue
@@ -4,7 +4,7 @@
从不咕咕的鸽纸
服主
🛠️📫 |
Catrainbow
开发组长
💻📫 |
- 
PexEric
运维组长
🛠️🧑🤝🧑📫 |
+
苏打
运维组长
🛠️🧑🤝🧑📫 |
PexEric
策划组长
📖🎨📫 |
diff --git a/docs/.vuepress/.temp/pages/team/main.html.js b/docs/.vuepress/.temp/pages/team/main.html.js
index ab4c9160..73467d1f 100644
--- 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
index 606759bc..e462c7a9 100644
--- a/docs/team/leadership.md
+++ b/docs/team/leadership.md
@@ -6,7 +6,7 @@
从不咕咕的鸽纸
服主
🛠️📫 |
Catrainbow
开发组长
💻📫 |
-
PexEric
运维组长
🛠️🧑🤝🧑📫 |
+
苏打
运维组长
🛠️🧑🤝🧑📫 |
PexEric
策划组长
📖🎨📫 |
@@ -14,4 +14,3 @@
如果您有任何疑问，欢迎与我们[取得联系](mailto:admin@fapixel.com)。
-