diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3c81d6..6033ae7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,6 +92,7 @@ jobs: shell: bash run: | cmake --install build --prefix install + cp -r maay install/.maay - uses: actions/upload-artifact@v3 with: @@ -160,6 +161,7 @@ jobs: shell: bash run: | cmake --install build --prefix install + cp -r maay install/.maay - uses: actions/upload-artifact@v3 with: @@ -216,6 +218,7 @@ jobs: shell: bash run: | cmake --install build --prefix install + cp -r maay install/.maay - uses: actions/upload-artifact@v3 with: diff --git a/.maay/repo.json b/.maay/repo.json deleted file mode 100644 index eec7f72..0000000 --- a/.maay/repo.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "resource": { - "default": "assets/resource" - } -} diff --git a/.maay/control.json b/assets/maay/control.json similarity index 93% rename from .maay/control.json rename to assets/maay/control.json index 8a1f7ea..a0c483e 100644 --- a/.maay/control.json +++ b/assets/maay/control.json @@ -334,7 +334,7 @@ } }, { - "name": "活动:行至摩卢旁卡 16 艰难", + "name": "活动:行至摩卢旁卡 16 艰难(活动已结束)", "task": "JourneytoMorPankh", "option": ["all_in", "eat_candy_within_24h"], "provide": { @@ -351,6 +351,25 @@ "text": "1" } } + }, + { + "name": "活动:洞穴的囚徒 证明启示 05(活动已结束)", + "task": "dummyThePrisonerintheCave", + "option": ["all_in", "eat_candy_within_24h"], + "provide": { + "EnterTheShow": { + "next": "dummyThePrisonerintheCave" + }, + "TargetStageName": { + "text": "dummy证明启示V" + }, + "StageDifficulty": { + "next": "dummyStageDifficulty_None" + }, + "SetReplaysTimes": { + "text": "1" + } + } } ] } diff --git a/assets/maay/repo.json b/assets/maay/repo.json new file mode 100644 index 0000000..a747e5c --- /dev/null +++ b/assets/maay/repo.json @@ -0,0 +1,5 @@ +{ + "resource": { + "default": "resource" + } +} diff --git a/.maay/resource.json b/assets/maay/resource.json similarity index 100% rename from .maay/resource.json rename to assets/maay/resource.json diff --git a/source/cli/main.cpp b/source/cli/main.cpp index 835b2fa..afb5feb 100644 --- a/source/cli/main.cpp +++ b/source/cli/main.cpp @@ -380,7 +380,7 @@ bool proc_argv(int argc, char** argv, bool& debug, std::string& adb, std::string "17. 荒兽之野 06(洞悉 兽)\n" "18. 活动:绿湖噩梦 17 艰难(活动已结束)\n" "19. 活动:行至摩卢旁卡 16 艰难(活动已结束)\n" - "20. 活动:洞穴的囚徒 证明启示 05\n") + "20. 活动:洞穴的囚徒 证明启示 05(活动已结束)\n") << std::endl << std::endl << utf8_to_crt("请输入要执行的任务序号,可自定义顺序,以空格分隔,例如 1 2 4 12 3: ") << std::endl;