sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 08:38:20 +08:00
Code Activity

Merge branch 'master' into dev-minigame-for-pr

Browse Source 
# Conflicts:
#	module/ui/assets.py
This commit is contained in:
yypsybs
2023-09-01 17:58:39 +08:00
parent 0e5bebd25f c987eb68cb
commit fd9777940b
52 changed files with 591 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
module/config/argument/args.json
View File

@@ -1594,8 +1594,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230817_cn",
"event_20220414_cn",
"event_20230817_cn",
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
@@ -1915,8 +1915,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230817_cn",
"event_20220414_cn",
"event_20230817_cn",
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
@@ -2351,8 +2351,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230817_cn",
"event_20220414_cn",
"event_20230817_cn",
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
@@ -3024,6 +3024,7 @@
"coalition_20230323"
],
"display": "disabled",
"tw": "coalition_20230323",
"cn": "coalition_20230323",
"en": "coalition_20230323",
"jp": "coalition_20230323"
@@ -3698,8 +3699,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230817_cn",
"event_20220414_cn",
"event_20230817_cn",
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
@@ -4151,8 +4152,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230817_cn",
"event_20220414_cn",
"event_20230817_cn",
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
@@ -4604,8 +4605,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230817_cn",
"event_20220414_cn",
"event_20230817_cn",
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
@@ -5057,8 +5058,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230817_cn",
"event_20220414_cn",
"event_20230817_cn",
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
@@ -5500,8 +5501,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230817_cn",
"event_20220414_cn",
"event_20230817_cn",
"event_20230803_cn",
"event_20211125_cn",
"event_20200917_cn",
@@ -6172,6 +6173,7 @@
"coalition_20230323"
],
"display": "disabled",
"tw": "coalition_20230323",
"cn": "coalition_20230323",
"en": "coalition_20230323",
"jp": "coalition_20230323"
@@ -8161,7 +8163,7 @@
"OpsiVoucher": {
"Filter": {
"type": "textarea",
"value": "LoggerAbyssal > LoggerObscure > Book > Coin"
"value": "LoggerAbyssal > LoggerObscure > Book > Coin > Fragment"
}
},
"Storage": {

2
module/config/argument/argument.yaml
View File

@@ -625,7 +625,7 @@ OpsiShop:
BuySupply: true
OpsiVoucher:
Filter: |-
LoggerAbyssal > LoggerObscure > Book > Coin
LoggerAbyssal > LoggerObscure > Book > Coin > Fragment
OpsiDaily:
DoMission: true
UseTuningSample: true

25
module/config/argument/gui.yaml
View File

@@ -60,6 +60,27 @@ AddAlas:
FileExist:
InvalidChar:
InvalidPrefixTemplate:
Manage:
AppManage:
PageTitle:
TitleNew:
NewName:
CopyFrom:
NameExist:
InvalidChar:
InvalidPrefixTemplate:
Back:
New:
Import:
Export:
Delete:
OverrideWarning:
ImportSuccess:
NewSuccess:
Name:
Mod:
Actions:
Update:
UpToDate:
@@ -90,4 +111,6 @@ Remote:
Text:
InvalidFeedBack:
Clear:
Clear:
EnterPassword:
ChooseFile: