diff --git a/README.md b/README.md index 29dcc65cef..1a2b82e50a 100644 --- a/README.md +++ b/README.md @@ -202,7 +202,7 @@ MAA 以中文(简体)为第一语言,翻译词条均以中文(简体) ## 广告 -用户交流 QQ 群:[MAA 使用 & 粥游交流 QQ 群](https://ota.maa.plus/MaaAssistantArknights/api/qqgroup/index.html) +用户交流 QQ 群:[MAA 使用 & 粥游交流 QQ 群](https://api.maa.plus/MaaAssistantArknights/api/qqgroup/index.html) Discord 服务器: [邀请链接](https://discord.gg/23DfZ9uA4V) 用户交流 TG 群:[Telegram 群](https://t.me/+Mgc2Zngr-hs3ZjU1) 自动战斗 JSON 作业分享:[prts.plus](https://prts.plus) diff --git a/docs/en-us/manual/introduction/combat.md b/docs/en-us/manual/introduction/combat.md index 5c198a75af..da89dc7fec 100644 --- a/docs/en-us/manual/introduction/combat.md +++ b/docs/en-us/manual/introduction/combat.md @@ -50,7 +50,7 @@ icon: hugeicons:brain-02 - Chip stages. The input must be complete with stage number, such as `PR-A-1`. - Annihilation. The input must be `Annihilation`. - Some side story stages, now contains `OF-1`, `OF-F3` and `GT-5`. - - The last three stages of the current SS event. This is available after downloading updates automatically from the [API](https://ota.maa.plus/MaaAssistantArknights/api/gui/StageActivity.json) when the event is on. The prompt will be shown on the main page when this is available. + - The last three stages of the current SS event. This is available after downloading updates automatically from the [API](https://api.maa.plus/MaaAssistantArknights/api/gui/StageActivity.json) when the event is on. The prompt will be shown on the main page when this is available. - For the SS event rerun, you can enter `SSReopen-XX` to clear XX-1 ~ XX-9 levels once. Example `SSReopen-IC`. ::: details Example diff --git a/docs/en-us/readme.md b/docs/en-us/readme.md index 8eec0e111e..a048e15121 100644 --- a/docs/en-us/readme.md +++ b/docs/en-us/readme.md @@ -202,7 +202,7 @@ This software supports GPU acceleration, which relies on an independent componen ## Advertisement Discord Server: [Discord Invite](https://discord.gg/23DfZ9uA4V) -User Group: [Telegram](https://t.me/+Mgc2Zngr-hs3ZjU1), [QQ Group](https://ota.maa.plus/MaaAssistantArknights/api/qqgroup/index.html) +User Group: [Telegram](https://t.me/+Mgc2Zngr-hs3ZjU1), [QQ Group](https://api.maa.plus/MaaAssistantArknights/api/qqgroup/index.html) Copilot JSON Sharing: [prts.plus](https://prts.plus) Bilibili Livestreams: [MrEO Livestream](https://live.bilibili.com/2808861) Coding Sessions & [MAA-Official Livestream](https://live.bilibili.com/27548877) Gaming/Chats [Technical Discussion (QQ Group)](https://jq.qq.com/?_wv=1027&k=ypbzXcA2) diff --git a/docs/ja-jp/manual/introduction/combat.md b/docs/ja-jp/manual/introduction/combat.md index 967c38b0cf..cc4722c3e3 100644 --- a/docs/ja-jp/manual/introduction/combat.md +++ b/docs/ja-jp/manual/introduction/combat.md @@ -51,7 +51,7 @@ This page is outdated and maybe still in Simplified Chinese. Translation is need - 所有芯片本。必须输入完整关卡编号,如 `PR-A-1`。 - 剿灭作战。必须输入 `Annihilation`。 - 别传中的 `OF-1` / `OF-F3` / `GT-5`。 - - 当期 SS 活动 后三关。在自动访问 [API](https://ota.maa.plus/MaaAssistantArknights/api/gui/StageActivity.json) 下载更新后会在界面下方显示。 + - 当期 SS 活动 后三关。在自动访问 [API](https://api.maa.plus/MaaAssistantArknights/api/gui/StageActivity.json) 下载更新后会在界面下方显示。 - 复刻的 SS 活动。输入 `SSReopen-<关卡前缀>` ,可一次性刷完 XX-1 ~ XX-9 关,如 `SSReopen-IC`。 ::: details 画面例 diff --git a/docs/ja-jp/manual/introduction/introduction_old.md b/docs/ja-jp/manual/introduction/introduction_old.md index 4c43dfbabc..150a418350 100644 --- a/docs/ja-jp/manual/introduction/introduction_old.md +++ b/docs/ja-jp/manual/introduction/introduction_old.md @@ -18,7 +18,7 @@ icon: ic:baseline-article - SoCの場合のみ、完全なステージ番号を入力する必要があります。例: `PR-A-1` 。 - `Annihilation`(殲滅作戦)。 - `OF-1` / `OF-F3` / `GT-5` のみサポートされます。 - - 現在のSSイベントの最後の3つのステージ。 [API](https://ota.maa.plus/MaaAssistantArknights/api/gui/StageActivity.json) で更新が自動的にダウンロードされた後、メイン画面に対応するメッセージが表示されます。 + - 現在のSSイベントの最後の3つのステージ。 [API](https://api.maa.plus/MaaAssistantArknights/api/gui/StageActivity.json) で更新が自動的にダウンロードされた後、メイン画面に対応するメッセージが表示されます。 - 再刻印SSアクティビティは `SSReopen-XX` と入力するとXX-1~XX-9ステージを一度にクリアできます。 `SSReopen-IC` など。 ::: details 画面例 diff --git a/docs/ja-jp/readme.md b/docs/ja-jp/readme.md index c347ce9a23..06c2d92935 100644 --- a/docs/ja-jp/readme.md +++ b/docs/ja-jp/readme.md @@ -193,7 +193,7 @@ MAAをより良くするために開発・テストに貢献してくれたす ## 広告 -ユーザー研究グループQQグループ:[QQグループ](https://ota.maa.plus/MaaAssistantArknights/api/qqgroup/index.html) +ユーザー研究グループQQグループ:[QQグループ](https://api.maa.plus/MaaAssistantArknights/api/qqgroup/index.html) Discord サーバー: [Discord 招待リンク](https://discord.gg/23DfZ9uA4V) ユーザー研究グループTGグループ:[Telegram](https://t.me/+Mgc2Zngr-hs3ZjU1) 自動作戦JSON作業シェア:[prts.plus](https://prts.plus) diff --git a/docs/ko-kr/manual/introduction/combat.md b/docs/ko-kr/manual/introduction/combat.md index 9bcdc9a3ab..c4e626f6cc 100644 --- a/docs/ko-kr/manual/introduction/combat.md +++ b/docs/ko-kr/manual/introduction/combat.md @@ -47,7 +47,7 @@ icon: hugeicons:brain-02 - 모든 칩 스테이지. 완전한 스테이지 코드를 입력해야 합니다. 예: `PR-A-1`. - 섬멸 작전. `Annihilation`을 입력해야 합니다. - 상시 개방 이벤트의 경우 `OF-1`/`OF-F3`/`GT-5`와 같이 입력합니다. - - 현재 개방된 사이드 스토리 이벤트의 세 개의 스테이지입니다. [API](https://ota.maa.plus/MaaAssistantArknights/api/gui/StageActivity.json)에서 업데이트를 자동으로 다운로드 한 후 화면 하단에 표시됩니다. + - 현재 개방된 사이드 스토리 이벤트의 세 개의 스테이지입니다. [API](https://api.maa.plus/MaaAssistantArknights/api/gui/StageActivity.json)에서 업데이트를 자동으로 다운로드 한 후 화면 하단에 표시됩니다. - 재개방된 사이드 스토리 이벤트. `SSReopen-<스테이지 접두사>`를 입력하면 XX-1~XX-9 스테이지를 한 번에 완료할 수 있습니다. 예: `SSReopen-IC`. ::: details 예시 화면 diff --git a/docs/ko-kr/readme.md b/docs/ko-kr/readme.md index fb510a49a7..ab98c6825c 100644 --- a/docs/ko-kr/readme.md +++ b/docs/ko-kr/readme.md @@ -198,7 +198,7 @@ MAA의 개선을 위한 개발/테스트에 기여해준 모든 친구들에게 ## 광고 -사용자 그룹: [Telegram](https://t.me/+Mgc2Zngr-hs3ZjU1), [QQ 그룹](https://ota.maa.plus/MaaAssistantArknights/api/qqgroup/index.html) +사용자 그룹: [Telegram](https://t.me/+Mgc2Zngr-hs3ZjU1), [QQ 그룹](https://api.maa.plus/MaaAssistantArknights/api/qqgroup/index.html) Discord 서버: [Discord 링크](https://discord.gg/23DfZ9uA4V) [전략 JSON 공유](https://prts.plus) Bilibili 라이브 방송: [MrEO 방송](https://live.bilibili.com/2808861) 코딩 방송 & [MAA-Official 방송](https://live.bilibili.com/27548877) 게임/잡담 diff --git a/docs/zh-cn/manual/introduction/combat.md b/docs/zh-cn/manual/introduction/combat.md index 596f381f46..17b959b281 100644 --- a/docs/zh-cn/manual/introduction/combat.md +++ b/docs/zh-cn/manual/introduction/combat.md @@ -47,7 +47,7 @@ icon: hugeicons:brain-02 - 所有芯片本。必须输入完整关卡编号,如 `PR-A-1`。 - 剿灭作战。必须输入 `Annihilation`。 - 别传中的 `OF-1` / `OF-F3` / `GT-5`。 - - 当期 SS 活动 后三关。在自动访问 [API](https://ota.maa.plus/MaaAssistantArknights/api/gui/StageActivity.json) 下载更新后会在界面下方显示。 + - 当期 SS 活动 后三关。在自动访问 [API](https://api.maa.plus/MaaAssistantArknights/api/gui/StageActivity.json) 下载更新后会在界面下方显示。 - 复刻的 SS 活动。输入 `SSReopen-<关卡前缀>` ,可一次性刷完 XX-1 ~ XX-9 关,如 `SSReopen-IC`。 ::: details 示例画面 diff --git a/docs/zh-cn/readme.md b/docs/zh-cn/readme.md index 389ea6b20e..412d5270de 100644 --- a/docs/zh-cn/readme.md +++ b/docs/zh-cn/readme.md @@ -195,7 +195,7 @@ MAA 以中文(简体)为第一语言,翻译词条均以中文(简体) ## 广告 -用户交流 QQ 群:[MAA 使用 & 粥游交流 QQ 群](https://ota.maa.plus/MaaAssistantArknights/api/qqgroup/index.html) +用户交流 QQ 群:[MAA 使用 & 粥游交流 QQ 群](https://api.maa.plus/MaaAssistantArknights/api/qqgroup/index.html) Discord 服务器: [邀请链接](https://discord.gg/23DfZ9uA4V) 用户交流 TG 群:[Telegram 群](https://t.me/+Mgc2Zngr-hs3ZjU1) 自动战斗 JSON 作业分享:[prts.plus](https://prts.plus) diff --git a/docs/zh-tw/manual/introduction/combat.md b/docs/zh-tw/manual/introduction/combat.md index eb0a3168d4..2b7dc8fc58 100644 --- a/docs/zh-tw/manual/introduction/combat.md +++ b/docs/zh-tw/manual/introduction/combat.md @@ -51,7 +51,7 @@ This page is outdated and maybe still in Simplified Chinese. Translation is need - 所有芯片本。必须输入完整关卡编号,如 `PR-A-1`。 - 剿灭作战。必须输入 `Annihilation`。 - 别传中的 `OF-1` / `OF-F3` / `GT-5`。 - - 当期 SS 活动 后三关。在自动访问 [API](https://ota.maa.plus/MaaAssistantArknights/api/gui/StageActivity.json) 下载更新后会在界面下方显示。 + - 当期 SS 活动 后三关。在自动访问 [API](https://api.maa.plus/MaaAssistantArknights/api/gui/StageActivity.json) 下载更新后会在界面下方显示。 - 复刻的 SS 活动。输入 `SSReopen-<关卡前缀>` ,可一次性刷完 XX-1 ~ XX-9 关,如 `SSReopen-IC`。 ::: details 範例畫面 diff --git a/docs/zh-tw/manual/introduction/introduction_old.md b/docs/zh-tw/manual/introduction/introduction_old.md index a1e3cd35f0..2902c8f585 100644 --- a/docs/zh-tw/manual/introduction/introduction_old.md +++ b/docs/zh-tw/manual/introduction/introduction_old.md @@ -18,7 +18,7 @@ icon: ic:baseline-article - 晶片本,必須輸入完整關卡編號,如 `PR-A-1`。 - 剿滅作戰,必須輸入 `Annihilation`。 - 部分別傳,只支援 `OF-1` / `OF-F3` / `GT-5`。 - - 當期 SideStory 後三關,在自動訪問 [API](https://ota.maa.plus/MaaAssistantArknights/api/gui/StageActivity.json) 下載更新後,會在主介面下方顯示相應提示。 + - 當期 SideStory 後三關,在自動訪問 [API](https://api.maa.plus/MaaAssistantArknights/api/gui/StageActivity.json) 下載更新後,會在主介面下方顯示相應提示。 ::: details 範例畫面 diff --git a/docs/zh-tw/readme.md b/docs/zh-tw/readme.md index deb0013c1b..f144783022 100644 --- a/docs/zh-tw/readme.md +++ b/docs/zh-tw/readme.md @@ -197,7 +197,7 @@ MAA 以中文(簡體)為第一語言,翻譯詞條皆以中文(簡體) ## 廣告 -用戶交流 QQ 群:[MAA 使用 & 粥遊交流 QQ 群](https://ota.maa.plus/MaaAssistantArknights/api/qqgroup/index.html) +用戶交流 QQ 群:[MAA 使用 & 粥遊交流 QQ 群](https://api.maa.plus/MaaAssistantArknights/api/qqgroup/index.html) Discord 伺服器:[Discord](https://discord.gg/23DfZ9uA4V) 用戶交流 TG 群:[Telegram 群](https://t.me/+Mgc2Zngr-hs3ZjU1) 自動戰鬥 JSON 作業分享:[prts.plus](https://prts.plus) 或 [抄作業.com](http://抄作業.com) diff --git a/src/MaaWpfGui/Constants/MaaUrls.cs b/src/MaaWpfGui/Constants/MaaUrls.cs index 4fe738eef4..e9843ac953 100644 --- a/src/MaaWpfGui/Constants/MaaUrls.cs +++ b/src/MaaWpfGui/Constants/MaaUrls.cs @@ -42,19 +42,19 @@ namespace MaaWpfGui.Constants public const string MapPrts = "https://map.ark-nights.com/areas?coord_override=maa"; - public const string MaaApi = "https://ota.maa.plus/MaaAssistantArknights/api/"; + public const string MaaApi = "https://api.maa.plus/MaaAssistantArknights/api/"; - public const string MaaResourceApi = "https://ota.maa.plus/MaaAssistantArknights/MaaAssistantArknights/"; + public const string MaaResourceApi = "https://api.maa.plus/MaaAssistantArknights/MaaAssistantArknights/"; public const string AnnMirrorResourceApi = "https://maa-ota.annangela.cn/MaaAssistantArknights/MaaAssistantArknights/"; public const string S3ResourceApi = "https://s3.maa-org.net:25240/maaassistantarknights/MaaAssistantArknights/MaaAssistantArknights/"; public const string R2ResourceApi = "https://maa.r2.imgg.dev/MaaAssistantArknights/MaaAssistantArknights/"; - public const string QqGroups = "https://ota.maa.plus/MaaAssistantArknights/api/qqgroup/index.html"; + public const string QqGroups = "https://api.maa.plus/MaaAssistantArknights/api/qqgroup/index.html"; public const string QqChannel = "https://pd.qq.com/s/4j1ju9z47"; public const string GoogleAdbDownloadUrl = "https://dl.google.com/android/repository/platform-tools-latest-windows.zip"; - public const string AdbMaaMirrorDownloadUrl = "https://ota.maa.plus/MaaAssistantArknights/api/binaries/adb-windows.zip"; + public const string AdbMaaMirrorDownloadUrl = "https://api.maa.plus/MaaAssistantArknights/api/binaries/adb-windows.zip"; public const string GoogleAdbFilename = "adb-windows.zip"; private static string Language => ConfigurationHelper.GetGlobalValue(ConfigurationKeys.Localization, LocalizationHelper.DefaultLanguage); diff --git a/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs b/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs index f3b6bbf5ed..d9af512635 100644 --- a/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs @@ -172,7 +172,7 @@ public class VersionUpdateViewModel : Screen private const string InfoRequestUrl = "repos/MaaAssistantArknights/MaaAssistantArknights/releases/tags/"; */ - private const string MaaUpdateApi = "https://ota.maa.plus/MaaAssistantArknights/api/version/summary.json"; + private const string MaaUpdateApi = "https://api.maa.plus/MaaAssistantArknights/api/version/summary.json"; private JObject? _latestJson; private JObject? _assetsObject; diff --git a/src/Python/asst/updater.py b/src/Python/asst/updater.py index cce6dcca5a..f7635fc70e 100644 --- a/src/Python/asst/updater.py +++ b/src/Python/asst/updater.py @@ -16,7 +16,7 @@ from . import downloader class Updater: # API的地址 - Mirrors = ["https://ota.maa.plus"] + Mirrors = ["https://api.maa.plus"] Summary_json = "/MaaAssistantArknights/api/version/summary.json" @staticmethod @@ -79,15 +79,15 @@ class Updater: { "alpha": { "version": "v4.24.0-beta.1.d006.g27dee653d", - "detail": "https://ota.maa.plus/MaaAssistantArknights/api/version/alpha.json" + "detail": "https://api.maa.plus/MaaAssistantArknights/api/version/alpha.json" }, "beta": { "version": "v4.24.0-beta.1", - "detail": "https://ota.maa.plus/MaaAssistantArknights/api/version/beta.json" + "detail": "https://api.maa.plus/MaaAssistantArknights/api/version/beta.json" }, "stable": { "version": "v4.23.3", - "detail": "https://ota.maa.plus/MaaAssistantArknights/api/version/stable.json" + "detail": "https://api.maa.plus/MaaAssistantArknights/api/version/stable.json" } } """ @@ -131,7 +131,7 @@ class Updater: else: # Windows ARM64 system_platform = "win-arm64" - # 请求的是https://ota.maa.plus/MaaAssistantArknights/api/version/stable.json,或其他版本类型对应的url + # 请求的是https://api.maa.plus/MaaAssistantArknights/api/version/stable.json,或其他版本类型对应的url detail_json = request.urlopen(detail) detail_data = json.loads(detail_json.read().decode("utf-8")) assets_list = detail_data["details"]["assets"] # 列表,子元素为字典 diff --git a/src/Python/sample.py b/src/Python/sample.py index da9836bdce..ed530d597a 100644 --- a/src/Python/sample.py +++ b/src/Python/sample.py @@ -36,7 +36,7 @@ if __name__ == "__main__": # 2. 加载活动关卡资源(需先下载): # 首先下载活动关卡的任务数据: # import urllib.request - # ota_tasks_url = 'https://ota.maa.plus/MaaAssistantArknights/api/resource/tasks.json' + # ota_tasks_url = 'https://api.maa.plus/MaaAssistantArknights/api/resource/tasks.json' # ota_tasks_path = path / 'cache' / 'resource' / 'tasks.json' # ota_tasks_path.parent.mkdir(parents=True, exist_ok=True) # with open(ota_tasks_path, 'w', encoding='utf-8') as f: diff --git a/website/apps/web/src/components/home/HomeActions/HomeActions.tsx b/website/apps/web/src/components/home/HomeActions/HomeActions.tsx index 38fd1fe108..624dc25c12 100644 --- a/website/apps/web/src/components/home/HomeActions/HomeActions.tsx +++ b/website/apps/web/src/components/home/HomeActions/HomeActions.tsx @@ -52,7 +52,7 @@ export const HomeActions: FC = ({ toggleLinks, showLinks }) => - +
QQ 群 diff --git a/website/apps/web/src/hooks/use-release.ts b/website/apps/web/src/hooks/use-release.ts index c9cc322745..4abd9838b4 100644 --- a/website/apps/web/src/hooks/use-release.ts +++ b/website/apps/web/src/hooks/use-release.ts @@ -15,7 +15,7 @@ export type Release = Omit< export const useRelease = () => { const { data, ...rest } = useSWR<{ details: Release - }>('https://ota.maa.plus/MaaAssistantArknights/api/version/stable.json') + }>('https://api.maa.plus/MaaAssistantArknights/api/version/stable.json') return { data: data?.details, ...rest,