diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 19a587960..56ecb64e0 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,8 +1,7 @@ -- 🔴**当前项目处于重构阶段(2025.3.14-)** -- ✅ 接受:与main直接相关的Bug修复:提交到main-fix分支 -- ⚠️ 冻结:所有新功能开发和非紧急重构 - +- ✅ 接受:与main直接相关的Bug修复:提交到dev分支 +- 新增功能类pr需要经过issue提前讨论,否则不会被合并 + # 请填写以下内容 (删除掉中括号内的空格,并替换为**小写的x**) 1. - [ ] `main` 分支 **禁止修改**,请确认本次提交的分支 **不是 `main` 分支** diff --git a/README.md b/README.md index c2fd750dc..fa97fec14 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # 麦麦!MaiCore-MaiMBot (编辑中) +## 新版0.6.0部署前先阅读:https://docs.mai-mai.org/manual/usage/mmc_q_a +
![Python Version](https://img.shields.io/badge/Python-3.9+-blue) @@ -65,7 +67,8 @@ - [📚 核心Wiki文档](https://docs.mai-mai.org) - 项目最全面的文档中心,你可以了解麦麦有关的一切 ### 最新版本部署教程(MaiCore版本) -- [🚀 最新版本部署教程](https://docs.mai-mai.org/manual/deployment/refactor_deploy.html) - 基于MaiCore的新版本部署方式(与旧版本不兼容) +- [🚀 最新版本部署教程](https://docs.mai-mai.org/manual/deployment/mmc_deploy.html) - 基于MaiCore的新版本部署方式(与旧版本不兼容) + ## 🎯 功能介绍 diff --git a/docker-compose.yml b/docker-compose.yml index 8062b358d..bde382e5f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,8 +19,8 @@ services: - maim_bot core: container_name: maim-bot-core - image: sengokucola/maimbot:refactor - # image: infinitycat/maimbot:refactor + image: sengokucola/maimbot:main + # image: infinitycat/maimbot:main environment: - TZ=Asia/Shanghai # - EULA_AGREE=35362b6ea30f12891d46ef545122e84a # 同意EULA diff --git a/scripts/run.sh b/scripts/run.sh index 1f7fba1ce..c1fe4973f 100644 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -369,7 +369,28 @@ run_installation() { # 选择分支 choose_branch() { - BRANCH=refactor + BRANCH=$(whiptail --title "🔀 选择分支" --radiolist "请选择要安装的分支:" 15 60 4 \ + "main" "稳定最新版(推荐)" ON \ + "classical" "经典版" OFF \ + "custom" "自定义分支" OFF 3>&1 1>&2 2>&3) + RETVAL=$? + if [ $RETVAL -ne 0 ]; then + whiptail --msgbox "操作取消!" 10 60 + exit 1 + fi + + if [[ "$BRANCH" == "custom" ]]; then + BRANCH=$(whiptail --title "🔀 自定义分支" --inputbox "请输入自定义分支名称:" 10 60 "refactor" 3>&1 1>&2 2>&3) + RETVAL=$? + if [ $RETVAL -ne 0 ]; then + whiptail --msgbox "输入取消!" 10 60 + exit 1 + fi + if [[ -z "$BRANCH" ]]; then + whiptail --msgbox "🚫 分支名称不能为空!" 10 60 + exit 1 + fi + fi } choose_branch