Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev

Browse Source

...

This commit is contained in:

MistEO

2022-07-19 23:36:19 +08:00

parent c5ea4b5e8d b5d54e683f

commit e2866cb2a4

48 changed files with 1110 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1110

resource/global/YoStarJP/resource/tasks.json

File diff suppressed because it is too large Load Diff

BIN

resource/global/YoStarJP/resource/template/Roguelike1Abandon.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1BattleAbandon.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1BattleAbandonConfirm.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 17 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1ChooseDifficulty.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.3 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1ChooseOperConfirm.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.6 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1Continue.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 42 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1DropsFlag.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1EnterAfterRecruit.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 40 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1FormationConfirm.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.4 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1GetDrop1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1GetDrop2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 11 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1GetDrop3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.6 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1GetDropCompleted.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 51 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1GetDropLeave.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 43 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1GetDropRecruit.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 14 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1GetDropSelect.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.6 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1GetDropSelectReward.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.9 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1LastReward.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 100 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1LastReward2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 96 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1LastReward3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 98 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1MissionFailedFlag2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 46 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1QuickFormation.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.6 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1Recruit.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 13 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1Recruit1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 102 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1RecruitCloseGuide.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1RecruitConfirm.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 16 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1StageCambatDpsEnter.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 33 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1StageDreadfulFoeEnter.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 31 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1StageEmergencyDpsEnter.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 30 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1StageEncounterEnter.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 30 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1StageEncounterLeaveConfirm.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 24 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1StageEncounterUnknown.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1StageSafeHouseEnter.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 31 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1StageTraderEnter.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 33 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1StageTraderInvestCancel.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.4 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1StageTraderInvestConfirm.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1StageTraderInvestSystem.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 13 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1StageTraderInvestSystemEnter.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 75 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1StageTraderInvestSystemLeave.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.1 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1StageTraderLeave.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.0 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1StageTraderLeaveConfirm.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 13 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1Start.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 58 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1StartAction.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 29 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1Team3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 103 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1TeamConfirm.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 16 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1TodoEnter.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 31 KiB

BIN

resource/global/YoStarJP/resource/template/Roguelike1TraderRandomShoppingConfirm.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.9 KiB