Compare commits
1 Commits
master
..
7c33bd42c6
| Author | SHA1 | Date | |
|---|---|---|---|
 YoursFunny
|
7c33bd42c6
|
@@ -12,7 +12,7 @@
|
||||
|
||||
The script is still under active development. The following features have been implemented:
|
||||
|
||||
- [x] **Cafe** Claim rewards / Interact / Invitation / Second floor
|
||||
- [x] **Cafe** Claim rewards / Interact / Second floor
|
||||
- [x] **Club** Claim AP
|
||||
- [x] **Mailbox** Claim rewards
|
||||
- [x] **Bounty** Auto sweep
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
当前脚本还在活跃开发中，已经实现的功能有：
|
||||
|
||||
- [x] **咖啡厅** 领取奖励 / 互动 / 邀请 / 第二咖啡厅
|
||||
- [x] **咖啡厅** 领取奖励 / 互动 / 第二咖啡厅
|
||||
- [x] **公会** 领取体力
|
||||
- [x] **邮箱** 领取奖励
|
||||
- [x] **悬赏通缉** 自动扫荡
|
||||
|
||||
|
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 6.0 KiB |
|
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 7.1 KiB |
|
Before Width: | Height: | Size: 8.9 KiB After Width: | Height: | Size: 9.7 KiB |
|
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 9.4 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 5.6 KiB |
|
Before Width: | Height: | Size: 5.7 KiB |
|
Before Width: | Height: | Size: 5.6 KiB |
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 5.8 KiB |
|
After Width: | Height: | Size: 7.2 KiB |
|
After Width: | Height: | Size: 7.6 KiB |
|
Before Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 9.4 KiB After Width: | Height: | Size: 9.9 KiB |
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 7.8 KiB |
|
Before Width: | Height: | Size: 9.9 KiB After Width: | Height: | Size: 9.7 KiB |
|
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 8.3 KiB After Width: | Height: | Size: 9.2 KiB |
|
Before Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 5.4 KiB |
|
Before Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 5.4 KiB |
|
Before Width: | Height: | Size: 5.8 KiB |
|
Before Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 6.6 KiB |
|
Before Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 43 KiB |
|
Before Width: | Height: | Size: 6.5 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 5.4 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 5.3 KiB |
|
Before Width: | Height: | Size: 6.0 KiB After Width: | Height: | Size: 5.8 KiB |
|
Before Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 6.1 KiB |
|
Before Width: | Height: | Size: 5.3 KiB |
|
Before Width: | Height: | Size: 5.7 KiB |
|
Before Width: | Height: | Size: 6.6 KiB |
|
Before Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 6.2 KiB |
|
Before Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 6.5 KiB |
|
Before Width: | Height: | Size: 6.0 KiB |
|
Before Width: | Height: | Size: 5.8 KiB After Width: | Height: | Size: 6.8 KiB |
|
Before Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 8.9 KiB |
|
Before Width: | Height: | Size: 6.5 KiB After Width: | Height: | Size: 9.3 KiB |
|
Before Width: | Height: | Size: 7.1 KiB After Width: | Height: | Size: 8.7 KiB |
|
Before Width: | Height: | Size: 7.0 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 8.0 KiB After Width: | Height: | Size: 5.6 KiB |
|
Before Width: | Height: | Size: 8.1 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.6 KiB |
|
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 5.8 KiB |
|
After Width: | Height: | Size: 7.2 KiB |
|
After Width: | Height: | Size: 7.6 KiB |
|
Before Width: | Height: | Size: 9.7 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 5.3 KiB |
|
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 7.0 KiB |
|
Before Width: | Height: | Size: 49 KiB |
|
Before Width: | Height: | Size: 6.6 KiB |
|
Before Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 5.8 KiB |
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 7.1 KiB After Width: | Height: | Size: 8.5 KiB |
|
Before Width: | Height: | Size: 5.8 KiB After Width: | Height: | Size: 6.1 KiB |
|
Before Width: | Height: | Size: 7.2 KiB After Width: | Height: | Size: 7.0 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 11 KiB |
@@ -48,10 +48,9 @@
|
||||
},
|
||||
"Invitation": {
|
||||
"Enable": true,
|
||||
"WaitingHour": 0,
|
||||
"Choice": "list_top",
|
||||
"Name": null,
|
||||
"Substitute": false
|
||||
"Substitute": true
|
||||
}
|
||||
},
|
||||
"Circle": {
|
||||
@@ -81,15 +80,15 @@
|
||||
"OnError": "skip"
|
||||
},
|
||||
"Highway": {
|
||||
"Stage": 0,
|
||||
"Stage": 1,
|
||||
"Count": 2
|
||||
},
|
||||
"DesertRailroad": {
|
||||
"Stage": 0,
|
||||
"Stage": 1,
|
||||
"Count": 2
|
||||
},
|
||||
"Schoolhouse": {
|
||||
"Stage": 0,
|
||||
"Stage": 1,
|
||||
"Count": 2
|
||||
}
|
||||
},
|
||||
@@ -104,15 +103,15 @@
|
||||
"OnError": "skip"
|
||||
},
|
||||
"Trinity": {
|
||||
"Stage": 0,
|
||||
"Stage": 1,
|
||||
"Count": 2
|
||||
},
|
||||
"Gehenna": {
|
||||
"Stage": 0,
|
||||
"Stage": 1,
|
||||
"Count": 2
|
||||
},
|
||||
"Millennium": {
|
||||
"Stage": 0,
|
||||
"Stage": 1,
|
||||
"Count": 2
|
||||
}
|
||||
},
|
||||
|
||||
@@ -211,16 +211,6 @@
|
||||
"type": "checkbox",
|
||||
"value": true
|
||||
},
|
||||
"WaitingHour": {
|
||||
"type": "select",
|
||||
"value": 0,
|
||||
"option": [
|
||||
0,
|
||||
3,
|
||||
6,
|
||||
9
|
||||
]
|
||||
},
|
||||
"Choice": {
|
||||
"type": "select",
|
||||
"value": "list_top",
|
||||
@@ -235,7 +225,7 @@
|
||||
},
|
||||
"Substitute": {
|
||||
"type": "checkbox",
|
||||
"value": false
|
||||
"value": true
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -332,9 +322,8 @@
|
||||
"Highway": {
|
||||
"Stage": {
|
||||
"type": "select",
|
||||
"value": 0,
|
||||
"value": 1,
|
||||
"option": [
|
||||
0,
|
||||
1,
|
||||
2,
|
||||
3,
|
||||
@@ -343,8 +332,7 @@
|
||||
6,
|
||||
7,
|
||||
8,
|
||||
9,
|
||||
10
|
||||
9
|
||||
]
|
||||
},
|
||||
"Count": {
|
||||
@@ -355,9 +343,8 @@
|
||||
"DesertRailroad": {
|
||||
"Stage": {
|
||||
"type": "select",
|
||||
"value": 0,
|
||||
"value": 1,
|
||||
"option": [
|
||||
0,
|
||||
1,
|
||||
2,
|
||||
3,
|
||||
@@ -366,8 +353,7 @@
|
||||
6,
|
||||
7,
|
||||
8,
|
||||
9,
|
||||
10
|
||||
9
|
||||
]
|
||||
},
|
||||
"Count": {
|
||||
@@ -378,9 +364,8 @@
|
||||
"Schoolhouse": {
|
||||
"Stage": {
|
||||
"type": "select",
|
||||
"value": 0,
|
||||
"value": 1,
|
||||
"option": [
|
||||
0,
|
||||
1,
|
||||
2,
|
||||
3,
|
||||
@@ -389,8 +374,7 @@
|
||||
6,
|
||||
7,
|
||||
8,
|
||||
9,
|
||||
10
|
||||
9
|
||||
]
|
||||
},
|
||||
"Count": {
|
||||
@@ -438,9 +422,8 @@
|
||||
"Trinity": {
|
||||
"Stage": {
|
||||
"type": "select",
|
||||
"value": 0,
|
||||
"value": 1,
|
||||
"option": [
|
||||
0,
|
||||
1,
|
||||
2,
|
||||
3,
|
||||
@@ -455,9 +438,8 @@
|
||||
"Gehenna": {
|
||||
"Stage": {
|
||||
"type": "select",
|
||||
"value": 0,
|
||||
"value": 1,
|
||||
"option": [
|
||||
0,
|
||||
1,
|
||||
2,
|
||||
3,
|
||||
@@ -472,9 +454,8 @@
|
||||
"Millennium": {
|
||||
"Stage": {
|
||||
"type": "select",
|
||||
"value": 0,
|
||||
"value": 1,
|
||||
"option": [
|
||||
0,
|
||||
1,
|
||||
2,
|
||||
3,
|
||||
|
||||
@@ -82,16 +82,13 @@ Cafe:
|
||||
SecondCafe: true
|
||||
Invitation:
|
||||
Enable: true
|
||||
WaitingHour:
|
||||
value: 0
|
||||
option: [ 0, 3, 6, 9 ]
|
||||
Choice:
|
||||
value: list_top
|
||||
option: [ list_top, by_name ]
|
||||
Name:
|
||||
value: null
|
||||
type: textarea
|
||||
Substitute: false
|
||||
Substitute: true
|
||||
|
||||
Bounty:
|
||||
OnError:
|
||||
@@ -100,18 +97,18 @@ Bounty:
|
||||
|
||||
Highway:
|
||||
Stage:
|
||||
value: 0
|
||||
option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
|
||||
value: 1
|
||||
option: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
|
||||
Count: 2
|
||||
DesertRailroad:
|
||||
Stage:
|
||||
value: 0
|
||||
option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
|
||||
value: 1
|
||||
option: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
|
||||
Count: 2
|
||||
Schoolhouse:
|
||||
Stage:
|
||||
value: 0
|
||||
option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
|
||||
value: 1
|
||||
option: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
|
||||
Count: 2
|
||||
|
||||
Scrimmage:
|
||||
@@ -121,18 +118,18 @@ Scrimmage:
|
||||
|
||||
Trinity:
|
||||
Stage:
|
||||
value: 0
|
||||
option: [ 0, 1, 2, 3, 4 ]
|
||||
value: 1
|
||||
option: [ 1, 2, 3, 4 ]
|
||||
Count: 2
|
||||
Gehenna:
|
||||
Stage:
|
||||
value: 0
|
||||
option: [ 0, 1, 2, 3, 4 ]
|
||||
value: 1
|
||||
option: [ 1, 2, 3, 4 ]
|
||||
Count: 2
|
||||
Millennium:
|
||||
Stage:
|
||||
value: 0
|
||||
option: [ 0, 1, 2, 3, 4 ]
|
||||
value: 1
|
||||
option: [ 1, 2, 3, 4 ]
|
||||
Count: 2
|
||||
|
||||
TacticalChallenge:
|
||||
|
||||
@@ -47,39 +47,38 @@ class GeneratedConfig:
|
||||
|
||||
# Group `Invitation`
|
||||
Invitation_Enable = True
|
||||
Invitation_WaitingHour = 0 # 0, 3, 6, 9
|
||||
Invitation_Choice = 'list_top' # list_top, by_name
|
||||
Invitation_Name = None
|
||||
Invitation_Substitute = False
|
||||
Invitation_Substitute = True
|
||||
|
||||
# Group `Bounty`
|
||||
Bounty_OnError = 'skip' # stop, skip
|
||||
|
||||
# Group `Highway`
|
||||
Highway_Stage = 0 # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
|
||||
Highway_Stage = 1 # 1, 2, 3, 4, 5, 6, 7, 8, 9
|
||||
Highway_Count = 2
|
||||
|
||||
# Group `DesertRailroad`
|
||||
DesertRailroad_Stage = 0 # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
|
||||
DesertRailroad_Stage = 1 # 1, 2, 3, 4, 5, 6, 7, 8, 9
|
||||
DesertRailroad_Count = 2
|
||||
|
||||
# Group `Schoolhouse`
|
||||
Schoolhouse_Stage = 0 # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
|
||||
Schoolhouse_Stage = 1 # 1, 2, 3, 4, 5, 6, 7, 8, 9
|
||||
Schoolhouse_Count = 2
|
||||
|
||||
# Group `Scrimmage`
|
||||
Scrimmage_OnError = 'skip' # stop, skip
|
||||
|
||||
# Group `Trinity`
|
||||
Trinity_Stage = 0 # 0, 1, 2, 3, 4
|
||||
Trinity_Stage = 1 # 1, 2, 3, 4
|
||||
Trinity_Count = 2
|
||||
|
||||
# Group `Gehenna`
|
||||
Gehenna_Stage = 0 # 0, 1, 2, 3, 4
|
||||
Gehenna_Stage = 1 # 1, 2, 3, 4
|
||||
Gehenna_Count = 2
|
||||
|
||||
# Group `Millennium`
|
||||
Millennium_Stage = 0 # 0, 1, 2, 3, 4
|
||||
Millennium_Stage = 1 # 1, 2, 3, 4
|
||||
Millennium_Count = 2
|
||||
|
||||
# Group `TacticalChallenge`
|
||||
|
||||
@@ -218,7 +218,7 @@
|
||||
},
|
||||
"SecondCafe": {
|
||||
"name": "Second Floor",
|
||||
"help": "Enable auto switch to second floor and perform interaction"
|
||||
"help": "JP server only\nEnable auto switch to second floor and perform interaction"
|
||||
}
|
||||
},
|
||||
"Invitation": {
|
||||
@@ -228,29 +228,21 @@
|
||||
},
|
||||
"Enable": {
|
||||
"name": "Enable",
|
||||
"help": "Enable cafe invitation"
|
||||
},
|
||||
"WaitingHour": {
|
||||
"name": "Invitation Condition",
|
||||
"help": "Choose whether to invite students based on the remaining time before next cafe refresh\nThis is for obtaining maximum student interation and maximum affection when AFK. Recommended option:\n24*7 AFK:\t\t Choose \"If 9 more hours remaining\"\nNormal usage:\t Choose \"Invite immediately\"",
|
||||
"0": "Invite immediately",
|
||||
"3": "If 3 more hours remaining",
|
||||
"6": "If 6 more hours remaining",
|
||||
"9": "If 9 more hours remaining"
|
||||
"help": ""
|
||||
},
|
||||
"Choice": {
|
||||
"name": "Choose Inviting Student",
|
||||
"help": "Top first student of list: Invite the student at the top first of the list\nBy name: Invite the student with the name you set below",
|
||||
"help": "",
|
||||
"list_top": "Top first student of list",
|
||||
"by_name": "By name"
|
||||
},
|
||||
"Name": {
|
||||
"name": "Inviting Student Name",
|
||||
"name": "Invited Student Name",
|
||||
"help": "Fill in the name of the student to be invited. Use in-game text language. Use > to connect multiple students. Example:\nJP: ホシノ(水着) > 御坂美琴 > ユズ\nOVERSEA: Hoshino(Swimsuit) > Yuuka > Kayoko(New Year)"
|
||||
},
|
||||
"Substitute": {
|
||||
"name": "Replace existing student",
|
||||
"help": "Whether to replace the existing student with their alt.\nIf not, try to match the next student"
|
||||
"help": "!TO BE CHANGED!Whether to replace the existing student with another costume.\nIf not, try to match the next student"
|
||||
}
|
||||
},
|
||||
"Bounty": {
|
||||
@@ -273,7 +265,6 @@
|
||||
"Stage": {
|
||||
"name": "Select Stage",
|
||||
"help": "",
|
||||
"0": "Auto select",
|
||||
"1": "01 - Overpass A",
|
||||
"2": "02 - Overpass B",
|
||||
"3": "03 - Overpass C",
|
||||
@@ -282,8 +273,7 @@
|
||||
"6": "06 - Overpass F",
|
||||
"7": "07 - Overpass G",
|
||||
"8": "08 - Overpass H",
|
||||
"9": "09 - Overpass I",
|
||||
"10": "10 - Overpass J"
|
||||
"9": "09 - Overpass I"
|
||||
},
|
||||
"Count": {
|
||||
"name": "Sweep X times",
|
||||
@@ -298,7 +288,6 @@
|
||||
"Stage": {
|
||||
"name": "Select Stage",
|
||||
"help": "",
|
||||
"0": "Auto select",
|
||||
"1": "01 - Abandoned Train A",
|
||||
"2": "02 - Abandoned Train B",
|
||||
"3": "03 - Abandoned Train C",
|
||||
@@ -307,8 +296,7 @@
|
||||
"6": "06 - Abandoned Train F",
|
||||
"7": "07 - Abandoned Train G",
|
||||
"8": "08 - Abandoned Train H",
|
||||
"9": "09 - Abandoned Train I",
|
||||
"10": "10 - Abandoned Train J"
|
||||
"9": "09 - Abandoned Train I"
|
||||
},
|
||||
"Count": {
|
||||
"name": "Sweep X times",
|
||||
@@ -323,7 +311,6 @@
|
||||
"Stage": {
|
||||
"name": "Select Stage",
|
||||
"help": "",
|
||||
"0": "Auto select",
|
||||
"1": "01 - Besieged Classroom A",
|
||||
"2": "02 - Besieged Classroom B",
|
||||
"3": "03 - Besieged Classroom C",
|
||||
@@ -332,8 +319,7 @@
|
||||
"6": "06 - Besieged Classroom F",
|
||||
"7": "07 - Besieged Classroom G",
|
||||
"8": "08 - Besieged Classroom H",
|
||||
"9": "09 - Besieged Classroom I",
|
||||
"10": "10 - Besieged Classroom J"
|
||||
"9": "09 - Besieged Classroom I"
|
||||
},
|
||||
"Count": {
|
||||
"name": "Sweep X times",
|
||||
@@ -360,7 +346,6 @@
|
||||
"Stage": {
|
||||
"name": "Select Stage",
|
||||
"help": "",
|
||||
"0": "Auto select",
|
||||
"1": "01 - Trinity A",
|
||||
"2": "02 - Trinity B",
|
||||
"3": "03 - Trinity C",
|
||||
@@ -379,7 +364,6 @@
|
||||
"Stage": {
|
||||
"name": "Select Stage",
|
||||
"help": "",
|
||||
"0": "Auto select",
|
||||
"1": "01 - Gehenna A",
|
||||
"2": "02 - Gehenna B",
|
||||
"3": "03 - Gehenna C",
|
||||
@@ -398,7 +382,6 @@
|
||||
"Stage": {
|
||||
"name": "Select Stage",
|
||||
"help": "",
|
||||
"0": "Auto select",
|
||||
"1": "01 - Millennium A",
|
||||
"2": "02 - Millennium B",
|
||||
"3": "03 - Millennium C",
|
||||
|
||||
@@ -218,7 +218,7 @@
|
||||
},
|
||||
"SecondCafe": {
|
||||
"name": "第二咖啡厅",
|
||||
"help": "自动切换第二咖啡厅进行互动点击"
|
||||
"help": "仅支持日服\n自动切换第二咖啡厅进行互动点击"
|
||||
}
|
||||
},
|
||||
"Invitation": {
|
||||
@@ -228,25 +228,17 @@
|
||||
},
|
||||
"Enable": {
|
||||
"name": "启用",
|
||||
"help": "是否启用咖啡厅邀请功能"
|
||||
},
|
||||
"WaitingHour": {
|
||||
"name": "邀请条件",
|
||||
"help": "根据距离下一次咖啡厅刷新的时长，选择是否邀请学生\n此项设立是为了后台挂机最大化收益，使得邀请券能被最大化利用。推荐选项：\n常驻挂机：\t选择“离下次刷新 9 小时以上”\n非常驻挂机：\t选择“不等待刷新，立即邀请”，或根据自己挂机时长选择",
|
||||
"0": "不等待刷新，立即邀请",
|
||||
"3": "离下次刷新 3 小时以上",
|
||||
"6": "离下次刷新 6 小时以上",
|
||||
"9": "离下次刷新 9 小时以上"
|
||||
"help": ""
|
||||
},
|
||||
"Choice": {
|
||||
"name": "选择邀请学生",
|
||||
"help": "按列表第一个：优先邀请列表中第一个学生，若失败则则尝试下一个\n按名字：优先邀请下方填写学生名的第一个，若失败则尝试下一个",
|
||||
"name": "选择被邀请学生",
|
||||
"help": "",
|
||||
"list_top": "按列表第一个",
|
||||
"by_name": "按名字"
|
||||
},
|
||||
"Name": {
|
||||
"name": "邀请学生名",
|
||||
"help": "填写要邀请的学生的名字，使用游戏内语言填写，多个学生使用 > 连接。例：\n日服：\tホシノ(水着) > 御坂美琴 > ユズ\n国际服：\tHoshino(Swimsuit) > Yuuka > Kayoko(New Year)"
|
||||
"help": "填写要邀请的学生的名字，使用游戏内语言填写，多个学生使用 > 连接。例：\n日服：ホシノ(水着) > 御坂美琴 > ユズ\n国际服：Hoshino(Swimsuit) > Yuuka > Kayoko(New Year)"
|
||||
},
|
||||
"Substitute": {
|
||||
"name": "是否替换已存在学生",
|
||||
@@ -273,7 +265,6 @@
|
||||
"Stage": {
|
||||
"name": "选择关卡",
|
||||
"help": "",
|
||||
"0": "自动选择",
|
||||
"1": "01 - 高架公路 A",
|
||||
"2": "02 - 高架公路 B",
|
||||
"3": "03 - 高架公路 C",
|
||||
@@ -282,8 +273,7 @@
|
||||
"6": "06 - 高架公路 F",
|
||||
"7": "07 - 高架公路 G",
|
||||
"8": "08 - 高架公路 H",
|
||||
"9": "09 - 高架公路 I",
|
||||
"10": "10 - 高架公路 J"
|
||||
"9": "09 - 高架公路 I"
|
||||
},
|
||||
"Count": {
|
||||
"name": "扫荡次数",
|
||||
@@ -298,7 +288,6 @@
|
||||
"Stage": {
|
||||
"name": "选择关卡",
|
||||
"help": "",
|
||||
"0": "自动选择",
|
||||
"1": "01 - 被遗弃的列车 A",
|
||||
"2": "02 - 被遗弃的列车 B",
|
||||
"3": "03 - 被遗弃的列车 C",
|
||||
@@ -307,8 +296,7 @@
|
||||
"6": "06 - 被遗弃的列车 F",
|
||||
"7": "07 - 被遗弃的列车 G",
|
||||
"8": "08 - 被遗弃的列车 H",
|
||||
"9": "09 - 被遗弃的列车 I",
|
||||
"10": "10 - 被遗弃的列车 J"
|
||||
"9": "09 - 被遗弃的列车 I"
|
||||
},
|
||||
"Count": {
|
||||
"name": "扫荡次数",
|
||||
@@ -323,7 +311,6 @@
|
||||
"Stage": {
|
||||
"name": "选择关卡",
|
||||
"help": "",
|
||||
"0": "自动选择",
|
||||
"1": "01 - 被袭击的教室 A",
|
||||
"2": "02 - 被袭击的教室 B",
|
||||
"3": "03 - 被袭击的教室 C",
|
||||
@@ -332,8 +319,7 @@
|
||||
"6": "06 - 被袭击的教室 F",
|
||||
"7": "07 - 被袭击的教室 G",
|
||||
"8": "08 - 被袭击的教室 H",
|
||||
"9": "09 - 被袭击的教室 I",
|
||||
"10": "10 - 被袭击的教室 J"
|
||||
"9": "09 - 被袭击的教室 I"
|
||||
},
|
||||
"Count": {
|
||||
"name": "扫荡次数",
|
||||
@@ -360,7 +346,6 @@
|
||||
"Stage": {
|
||||
"name": "选择关卡",
|
||||
"help": "",
|
||||
"0": "自动选择",
|
||||
"1": "01 - 三一 A",
|
||||
"2": "02 - 三一 B",
|
||||
"3": "03 - 三一 C",
|
||||
@@ -379,7 +364,6 @@
|
||||
"Stage": {
|
||||
"name": "选择关卡",
|
||||
"help": "",
|
||||
"0": "自动选择",
|
||||
"1": "01 - 格黑娜 A",
|
||||
"2": "02 - 格黑娜 B",
|
||||
"3": "03 - 格黑娜 C",
|
||||
@@ -398,7 +382,6 @@
|
||||
"Stage": {
|
||||
"name": "选择关卡",
|
||||
"help": "",
|
||||
"0": "自动选择",
|
||||
"1": "01 - 千年 A",
|
||||
"2": "02 - 千年 B",
|
||||
"3": "03 - 千年 C",
|
||||
|
||||
@@ -51,17 +51,17 @@ CAFE_CHECK = ButtonWrapper(
|
||||
name='CAFE_CHECK',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/CAFE_CHECK.png',
|
||||
area=(108, 11, 182, 36),
|
||||
search=(88, 0, 202, 56),
|
||||
color=(191, 200, 208),
|
||||
button=(108, 11, 182, 36),
|
||||
area=(264, 11, 337, 35),
|
||||
search=(244, 0, 357, 55),
|
||||
color=(188, 197, 205),
|
||||
button=(264, 11, 337, 35),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/base/page/CAFE_CHECK.png',
|
||||
area=(106, 12, 167, 36),
|
||||
search=(86, 0, 187, 56),
|
||||
color=(173, 184, 194),
|
||||
button=(106, 12, 167, 36),
|
||||
area=(196, 8, 259, 37),
|
||||
search=(176, 0, 279, 57),
|
||||
color=(188, 197, 206),
|
||||
button=(196, 8, 259, 37),
|
||||
),
|
||||
)
|
||||
CIRCLE_CHECK = ButtonWrapper(
|
||||
@@ -134,13 +134,6 @@ GACHA_CHECK = ButtonWrapper(
|
||||
)
|
||||
HOME = ButtonWrapper(
|
||||
name='HOME',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/HOME.png',
|
||||
area=(1224, 10, 1250, 35),
|
||||
search=(1204, 0, 1270, 55),
|
||||
color=(162, 176, 202),
|
||||
button=(1224, 10, 1250, 35),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/HOME.png',
|
||||
area=(1218, 8, 1253, 41),
|
||||
@@ -178,13 +171,6 @@ MAIL_CHECK = ButtonWrapper(
|
||||
)
|
||||
MAIN_GO_TO_CAFE = ButtonWrapper(
|
||||
name='MAIN_GO_TO_CAFE',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MAIN_GO_TO_CAFE.png',
|
||||
area=(86, 632, 113, 670),
|
||||
search=(66, 612, 133, 690),
|
||||
color=(174, 222, 246),
|
||||
button=(86, 632, 113, 670),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/MAIN_GO_TO_CAFE.png',
|
||||
area=(81, 638, 102, 668),
|
||||
@@ -195,30 +181,16 @@ MAIN_GO_TO_CAFE = ButtonWrapper(
|
||||
)
|
||||
MAIN_GO_TO_CIRCLE = ButtonWrapper(
|
||||
name='MAIN_GO_TO_CIRCLE',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MAIN_GO_TO_CIRCLE.png',
|
||||
area=(531, 631, 561, 659),
|
||||
search=(511, 611, 581, 679),
|
||||
color=(182, 230, 254),
|
||||
button=(531, 631, 561, 659),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/MAIN_GO_TO_CIRCLE.png',
|
||||
area=(542, 630, 581, 665),
|
||||
search=(522, 610, 601, 685),
|
||||
color=(163, 225, 242),
|
||||
button=(542, 630, 581, 665),
|
||||
area=(540, 631, 583, 660),
|
||||
search=(520, 611, 603, 680),
|
||||
color=(131, 204, 234),
|
||||
button=(540, 631, 583, 660),
|
||||
),
|
||||
)
|
||||
MAIN_GO_TO_CRAFTING = ButtonWrapper(
|
||||
name='MAIN_GO_TO_CRAFTING',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MAIN_GO_TO_CRAFTING.png',
|
||||
area=(645, 627, 667, 662),
|
||||
search=(625, 607, 687, 682),
|
||||
color=(206, 235, 251),
|
||||
button=(645, 627, 667, 662),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/MAIN_GO_TO_CRAFTING.png',
|
||||
area=(665, 622, 693, 664),
|
||||
@@ -229,13 +201,6 @@ MAIN_GO_TO_CRAFTING = ButtonWrapper(
|
||||
)
|
||||
MAIN_GO_TO_GACHA = ButtonWrapper(
|
||||
name='MAIN_GO_TO_GACHA',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MAIN_GO_TO_GACHA.png',
|
||||
area=(871, 626, 893, 671),
|
||||
search=(851, 606, 913, 691),
|
||||
color=(172, 223, 242),
|
||||
button=(871, 626, 893, 671),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/MAIN_GO_TO_GACHA.png',
|
||||
area=(900, 623, 924, 670),
|
||||
@@ -246,13 +211,6 @@ MAIN_GO_TO_GACHA = ButtonWrapper(
|
||||
)
|
||||
MAIN_GO_TO_MAIL = ButtonWrapper(
|
||||
name='MAIN_GO_TO_MAIL',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MAIN_GO_TO_MAIL.png',
|
||||
area=(1144, 27, 1165, 44),
|
||||
search=(1124, 7, 1185, 64),
|
||||
color=(102, 125, 168),
|
||||
button=(1144, 27, 1165, 44),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/MAIN_GO_TO_MAIL.png',
|
||||
area=(1130, 29, 1156, 49),
|
||||
@@ -263,47 +221,26 @@ MAIN_GO_TO_MAIL = ButtonWrapper(
|
||||
)
|
||||
MAIN_GO_TO_MOMOTALK = ButtonWrapper(
|
||||
name='MAIN_GO_TO_MOMOTALK',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MAIN_GO_TO_MOMOTALK.png',
|
||||
area=(125, 118, 146, 151),
|
||||
search=(105, 98, 166, 171),
|
||||
color=(244, 200, 211),
|
||||
button=(125, 118, 146, 151),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/MAIN_GO_TO_MOMOTALK.png',
|
||||
area=(138, 130, 159, 161),
|
||||
search=(118, 110, 179, 181),
|
||||
color=(251, 215, 224),
|
||||
button=(138, 130, 159, 161),
|
||||
area=(154, 134, 177, 158),
|
||||
search=(134, 114, 197, 178),
|
||||
color=(255, 219, 227),
|
||||
button=(154, 134, 177, 158),
|
||||
),
|
||||
)
|
||||
MAIN_GO_TO_PURCHASE = ButtonWrapper(
|
||||
name='MAIN_GO_TO_PURCHASE',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MAIN_GO_TO_PURCHASE.png',
|
||||
area=(122, 209, 148, 243),
|
||||
search=(102, 189, 168, 263),
|
||||
color=(190, 222, 246),
|
||||
button=(122, 209, 148, 243),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/MAIN_GO_TO_PURCHASE.png',
|
||||
area=(136, 210, 165, 250),
|
||||
search=(116, 190, 185, 270),
|
||||
color=(175, 216, 240),
|
||||
button=(136, 210, 165, 250),
|
||||
area=(148, 204, 183, 253),
|
||||
search=(128, 184, 203, 273),
|
||||
color=(172, 214, 239),
|
||||
button=(148, 204, 183, 253),
|
||||
),
|
||||
)
|
||||
MAIN_GO_TO_SCHEDULE = ButtonWrapper(
|
||||
name='MAIN_GO_TO_SCHEDULE',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MAIN_GO_TO_SCHEDULE.png',
|
||||
area=(198, 634, 217, 667),
|
||||
search=(178, 614, 237, 687),
|
||||
color=(176, 222, 243),
|
||||
button=(198, 634, 217, 667),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/MAIN_GO_TO_SCHEDULE.png',
|
||||
area=(194, 638, 216, 672),
|
||||
@@ -314,13 +251,6 @@ MAIN_GO_TO_SCHEDULE = ButtonWrapper(
|
||||
)
|
||||
MAIN_GO_TO_SHOP = ButtonWrapper(
|
||||
name='MAIN_GO_TO_SHOP',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MAIN_GO_TO_SHOP.png',
|
||||
area=(752, 628, 786, 665),
|
||||
search=(732, 608, 806, 685),
|
||||
color=(168, 221, 248),
|
||||
button=(752, 628, 786, 665),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/MAIN_GO_TO_SHOP.png',
|
||||
area=(773, 630, 816, 667),
|
||||
@@ -331,36 +261,29 @@ MAIN_GO_TO_SHOP = ButtonWrapper(
|
||||
)
|
||||
MAIN_GO_TO_TASK = ButtonWrapper(
|
||||
name='MAIN_GO_TO_TASK',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MAIN_GO_TO_TASK.png',
|
||||
area=(30, 214, 55, 248),
|
||||
search=(10, 194, 75, 268),
|
||||
color=(186, 218, 245),
|
||||
button=(30, 214, 55, 248),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/MAIN_GO_TO_TASK.png',
|
||||
area=(47, 219, 70, 246),
|
||||
search=(27, 199, 90, 266),
|
||||
color=(212, 204, 208),
|
||||
button=(47, 219, 70, 246),
|
||||
area=(52, 220, 78, 248),
|
||||
search=(32, 200, 98, 268),
|
||||
color=(226, 207, 203),
|
||||
button=(52, 220, 78, 248),
|
||||
),
|
||||
)
|
||||
MAIN_GO_TO_WORK = ButtonWrapper(
|
||||
name='MAIN_GO_TO_WORK',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MAIN_GO_TO_WORK.png',
|
||||
area=(1167, 668, 1222, 688),
|
||||
search=(1147, 648, 1242, 708),
|
||||
color=(141, 156, 174),
|
||||
button=(1167, 668, 1222, 688),
|
||||
area=(1167, 605, 1241, 632),
|
||||
search=(1147, 585, 1261, 652),
|
||||
color=(135, 149, 169),
|
||||
button=(1167, 605, 1241, 632),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/base/page/MAIN_GO_TO_WORK.png',
|
||||
area=(1143, 591, 1241, 613),
|
||||
search=(1123, 571, 1261, 633),
|
||||
color=(110, 129, 154),
|
||||
button=(1143, 591, 1241, 613),
|
||||
area=(1127, 605, 1250, 637),
|
||||
search=(1107, 585, 1270, 657),
|
||||
color=(90, 112, 141),
|
||||
button=(1127, 605, 1250, 637),
|
||||
),
|
||||
)
|
||||
MISSION_CHECK = ButtonWrapper(
|
||||
@@ -382,13 +305,6 @@ MISSION_CHECK = ButtonWrapper(
|
||||
)
|
||||
MOMOTALK_CHECK = ButtonWrapper(
|
||||
name='MOMOTALK_CHECK',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MOMOTALK_CHECK.png',
|
||||
area=(144, 107, 169, 130),
|
||||
search=(124, 87, 189, 150),
|
||||
color=(253, 211, 219),
|
||||
button=(144, 107, 169, 130),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/MOMOTALK_CHECK.png',
|
||||
area=(144, 107, 169, 130),
|
||||
@@ -530,101 +446,101 @@ WORK_GO_TO_BOUNTY = ButtonWrapper(
|
||||
name='WORK_GO_TO_BOUNTY',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/WORK_GO_TO_BOUNTY.png',
|
||||
area=(679, 401, 741, 417),
|
||||
search=(659, 381, 761, 437),
|
||||
color=(155, 164, 186),
|
||||
button=(679, 401, 741, 417),
|
||||
area=(669, 412, 765, 436),
|
||||
search=(649, 392, 785, 456),
|
||||
color=(165, 181, 208),
|
||||
button=(669, 412, 765, 436),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/base/page/WORK_GO_TO_BOUNTY.png',
|
||||
area=(668, 385, 756, 412),
|
||||
search=(648, 365, 776, 432),
|
||||
color=(180, 198, 223),
|
||||
button=(668, 385, 756, 412),
|
||||
area=(671, 409, 760, 440),
|
||||
search=(651, 389, 780, 460),
|
||||
color=(183, 202, 227),
|
||||
button=(671, 409, 760, 440),
|
||||
),
|
||||
)
|
||||
WORK_GO_TO_COMMISSIONS = ButtonWrapper(
|
||||
name='WORK_GO_TO_COMMISSIONS',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/WORK_GO_TO_COMMISSIONS.png',
|
||||
area=(661, 504, 724, 521),
|
||||
search=(641, 484, 744, 541),
|
||||
color=(155, 163, 184),
|
||||
button=(661, 504, 724, 521),
|
||||
area=(655, 494, 751, 518),
|
||||
search=(635, 474, 771, 538),
|
||||
color=(165, 179, 204),
|
||||
button=(655, 494, 751, 518),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/base/page/WORK_GO_TO_COMMISSIONS.png',
|
||||
area=(653, 477, 787, 496),
|
||||
search=(633, 457, 807, 516),
|
||||
color=(187, 199, 218),
|
||||
button=(653, 477, 787, 496),
|
||||
area=(656, 494, 803, 517),
|
||||
search=(636, 474, 823, 537),
|
||||
color=(192, 204, 221),
|
||||
button=(656, 494, 803, 517),
|
||||
),
|
||||
)
|
||||
WORK_GO_TO_MISSION = ButtonWrapper(
|
||||
name='WORK_GO_TO_MISSION',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/WORK_GO_TO_MISSION.png',
|
||||
area=(710, 220, 769, 249),
|
||||
search=(690, 200, 789, 269),
|
||||
color=(137, 153, 180),
|
||||
button=(710, 220, 769, 249),
|
||||
area=(720, 160, 803, 199),
|
||||
search=(700, 140, 823, 219),
|
||||
color=(165, 178, 204),
|
||||
button=(720, 160, 803, 199),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/base/page/WORK_GO_TO_MISSION.png',
|
||||
area=(721, 158, 873, 197),
|
||||
search=(701, 138, 893, 217),
|
||||
color=(180, 195, 215),
|
||||
button=(721, 158, 873, 197),
|
||||
area=(720, 160, 871, 206),
|
||||
search=(700, 140, 891, 226),
|
||||
color=(192, 204, 221),
|
||||
button=(720, 160, 871, 206),
|
||||
),
|
||||
)
|
||||
WORK_GO_TO_SCHOOL_EXCHANGE = ButtonWrapper(
|
||||
name='WORK_GO_TO_SCHOOL_EXCHANGE',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/WORK_GO_TO_SCHOOL_EXCHANGE.png',
|
||||
area=(642, 606, 721, 624),
|
||||
search=(622, 586, 741, 644),
|
||||
color=(167, 174, 192),
|
||||
button=(642, 606, 721, 624),
|
||||
area=(641, 575, 758, 599),
|
||||
search=(621, 555, 778, 619),
|
||||
color=(165, 179, 204),
|
||||
button=(641, 575, 758, 599),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/base/page/WORK_GO_TO_SCHOOL_EXCHANGE.png',
|
||||
area=(635, 569, 769, 597),
|
||||
search=(615, 549, 789, 617),
|
||||
color=(198, 204, 216),
|
||||
button=(635, 569, 769, 597),
|
||||
area=(643, 572, 778, 602),
|
||||
search=(623, 552, 798, 622),
|
||||
color=(190, 203, 221),
|
||||
button=(643, 572, 778, 602),
|
||||
),
|
||||
)
|
||||
WORK_GO_TO_STORY = ButtonWrapper(
|
||||
name='WORK_GO_TO_STORY',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/WORK_GO_TO_STORY.png',
|
||||
area=(993, 220, 1081, 250),
|
||||
search=(973, 200, 1101, 270),
|
||||
color=(209, 214, 224),
|
||||
button=(993, 220, 1081, 250),
|
||||
area=(995, 163, 1032, 197),
|
||||
search=(975, 143, 1052, 217),
|
||||
color=(191, 201, 219),
|
||||
button=(995, 163, 1032, 197),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/base/page/WORK_GO_TO_STORY.png',
|
||||
area=(996, 159, 1112, 205),
|
||||
search=(976, 139, 1132, 225),
|
||||
color=(200, 209, 225),
|
||||
button=(996, 159, 1112, 205),
|
||||
area=(994, 159, 1109, 211),
|
||||
search=(974, 139, 1129, 231),
|
||||
color=(208, 215, 228),
|
||||
button=(994, 159, 1109, 211),
|
||||
),
|
||||
)
|
||||
WORK_GO_TO_TACTICAL_CHALLENGE = ButtonWrapper(
|
||||
name='WORK_GO_TO_TACTICAL_CHALLENGE',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/WORK_GO_TO_TACTICAL_CHALLENGE.png',
|
||||
area=(821, 600, 911, 620),
|
||||
search=(801, 580, 931, 640),
|
||||
color=(156, 164, 185),
|
||||
button=(821, 600, 911, 620),
|
||||
area=(1012, 535, 1151, 562),
|
||||
search=(992, 515, 1171, 582),
|
||||
color=(159, 174, 200),
|
||||
button=(1012, 535, 1151, 562),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/base/page/WORK_GO_TO_TACTICAL_CHALLENGE.png',
|
||||
area=(803, 566, 922, 623),
|
||||
search=(783, 546, 942, 643),
|
||||
color=(186, 201, 220),
|
||||
button=(803, 566, 922, 623),
|
||||
area=(1034, 435, 1162, 466),
|
||||
search=(1014, 415, 1182, 486),
|
||||
color=(179, 199, 221),
|
||||
button=(1034, 435, 1162, 466),
|
||||
),
|
||||
)
|
||||
|
||||
@@ -22,8 +22,6 @@ class BountyUI(UI):
|
||||
return False
|
||||
|
||||
def enter_stage(self, index: int) -> bool:
|
||||
if not index:
|
||||
index = BOUNTY_LIST.insight_max_sweepable_index(self)
|
||||
if BOUNTY_LIST.select_index_enter(self, index):
|
||||
return True
|
||||
return False
|
||||
|
||||
@@ -27,68 +27,90 @@ CAFE_FIRST = ButtonWrapper(
|
||||
name='CAFE_FIRST',
|
||||
jp=Button(
|
||||
file='./assets/jp/cafe/CAFE_FIRST.png',
|
||||
area=(96, 92, 111, 110),
|
||||
search=(76, 72, 131, 130),
|
||||
color=(185, 192, 200),
|
||||
button=(96, 92, 111, 110),
|
||||
area=(82, 152, 136, 175),
|
||||
search=(62, 132, 156, 195),
|
||||
color=(111, 127, 147),
|
||||
button=(82, 152, 136, 175),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/cafe/CAFE_FIRST.png',
|
||||
area=(205, 96, 215, 107),
|
||||
search=(185, 76, 235, 127),
|
||||
color=(176, 184, 194),
|
||||
button=(205, 96, 215, 107),
|
||||
area=(82, 152, 136, 175),
|
||||
search=(62, 132, 156, 195),
|
||||
color=(111, 127, 147),
|
||||
button=(82, 152, 136, 175),
|
||||
),
|
||||
)
|
||||
CAFE_INVITE = ButtonWrapper(
|
||||
name='CAFE_INVITE',
|
||||
jp=Button(
|
||||
file='./assets/jp/cafe/CAFE_INVITE.png',
|
||||
area=(870, 637, 903, 663),
|
||||
search=(850, 617, 923, 683),
|
||||
color=(253, 217, 235),
|
||||
button=(870, 637, 903, 663),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/cafe/CAFE_INVITE.png',
|
||||
area=(870, 637, 903, 663),
|
||||
search=(850, 617, 923, 683),
|
||||
color=(253, 217, 235),
|
||||
button=(870, 637, 903, 663),
|
||||
area=(816, 635, 845, 655),
|
||||
search=(796, 615, 865, 675),
|
||||
color=(173, 182, 192),
|
||||
button=(816, 635, 845, 655),
|
||||
),
|
||||
en=None,
|
||||
)
|
||||
CAFE_INVITED = ButtonWrapper(
|
||||
name='CAFE_INVITED',
|
||||
jp=Button(
|
||||
file='./assets/jp/cafe/CAFE_INVITED.png',
|
||||
area=(870, 637, 903, 663),
|
||||
search=(850, 617, 923, 683),
|
||||
color=(111, 109, 109),
|
||||
button=(870, 637, 903, 663),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/cafe/CAFE_INVITED.png',
|
||||
area=(870, 637, 903, 663),
|
||||
search=(850, 617, 923, 683),
|
||||
color=(111, 109, 109),
|
||||
button=(870, 637, 903, 663),
|
||||
area=(815, 633, 847, 657),
|
||||
search=(795, 613, 867, 677),
|
||||
color=(144, 144, 146),
|
||||
button=(815, 633, 847, 657),
|
||||
),
|
||||
en=None,
|
||||
)
|
||||
CAFE_SECOND = ButtonWrapper(
|
||||
name='CAFE_SECOND',
|
||||
jp=Button(
|
||||
file='./assets/jp/cafe/CAFE_SECOND.png',
|
||||
area=(99, 92, 108, 110),
|
||||
search=(79, 72, 128, 130),
|
||||
color=(193, 200, 209),
|
||||
button=(99, 92, 108, 110),
|
||||
area=(219, 152, 279, 175),
|
||||
search=(199, 132, 299, 195),
|
||||
color=(110, 126, 146),
|
||||
button=(219, 152, 279, 175),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/cafe/CAFE_SECOND.png',
|
||||
area=(207, 96, 214, 107),
|
||||
search=(187, 76, 234, 127),
|
||||
color=(174, 182, 192),
|
||||
button=(207, 96, 214, 107),
|
||||
area=(219, 152, 279, 175),
|
||||
search=(199, 132, 299, 195),
|
||||
color=(110, 126, 146),
|
||||
button=(219, 152, 279, 175),
|
||||
),
|
||||
)
|
||||
CHANGE_CAFE_NOT_SELECTED = ButtonWrapper(
|
||||
name='CHANGE_CAFE_NOT_SELECTED',
|
||||
jp=Button(
|
||||
file='./assets/jp/cafe/CHANGE_CAFE_NOT_SELECTED.png',
|
||||
area=(84, 89, 178, 109),
|
||||
search=(64, 69, 198, 129),
|
||||
color=(185, 193, 203),
|
||||
button=(84, 89, 178, 109),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/cafe/CHANGE_CAFE_NOT_SELECTED.png',
|
||||
area=(84, 89, 178, 109),
|
||||
search=(64, 69, 198, 129),
|
||||
color=(185, 193, 203),
|
||||
button=(84, 89, 178, 109),
|
||||
),
|
||||
)
|
||||
CHANGE_CAFE_SELECTED = ButtonWrapper(
|
||||
name='CHANGE_CAFE_SELECTED',
|
||||
jp=Button(
|
||||
file='./assets/jp/cafe/CHANGE_CAFE_SELECTED.png',
|
||||
area=(40, 87, 191, 112),
|
||||
search=(20, 67, 211, 132),
|
||||
color=(82, 105, 130),
|
||||
button=(40, 87, 191, 112),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/cafe/CHANGE_CAFE_SELECTED.png',
|
||||
area=(40, 87, 191, 112),
|
||||
search=(20, 67, 211, 132),
|
||||
color=(82, 105, 130),
|
||||
button=(40, 87, 191, 112),
|
||||
),
|
||||
)
|
||||
CHECK_MOMOTALK = ButtonWrapper(
|
||||
@@ -100,29 +122,23 @@ CHECK_MOMOTALK = ButtonWrapper(
|
||||
color=(253, 203, 212),
|
||||
button=(421, 83, 447, 108),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/cafe/CHECK_MOMOTALK.png',
|
||||
area=(421, 83, 447, 108),
|
||||
search=(401, 63, 467, 128),
|
||||
color=(253, 203, 212),
|
||||
button=(421, 83, 447, 108),
|
||||
),
|
||||
en=None,
|
||||
)
|
||||
CHECK_REWARD = ButtonWrapper(
|
||||
name='CHECK_REWARD',
|
||||
jp=Button(
|
||||
file='./assets/jp/cafe/CHECK_REWARD.png',
|
||||
area=(1120, 635, 1166, 651),
|
||||
search=(1100, 615, 1186, 671),
|
||||
color=(79, 102, 127),
|
||||
button=(1109, 627, 1239, 691),
|
||||
area=(1095, 621, 1146, 637),
|
||||
search=(1075, 601, 1166, 657),
|
||||
color=(82, 105, 129),
|
||||
button=(1086, 607, 1225, 685),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/cafe/CHECK_REWARD.png',
|
||||
area=(1116, 636, 1218, 654),
|
||||
search=(1096, 616, 1238, 674),
|
||||
color=(77, 100, 125),
|
||||
button=(1113, 625, 1239, 692),
|
||||
area=(1090, 613, 1229, 644),
|
||||
search=(1070, 593, 1249, 664),
|
||||
color=(64, 88, 115),
|
||||
button=(1086, 611, 1229, 685),
|
||||
),
|
||||
)
|
||||
CLICKABLE_TEMPLATE = ButtonWrapper(
|
||||
@@ -146,10 +162,10 @@ GET_REWARD = ButtonWrapper(
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/cafe/GET_REWARD.png',
|
||||
area=(593, 506, 687, 548),
|
||||
search=(573, 486, 707, 568),
|
||||
color=(211, 193, 64),
|
||||
button=(543, 492, 736, 564),
|
||||
area=(581, 503, 692, 536),
|
||||
search=(561, 483, 712, 556),
|
||||
color=(208, 190, 63),
|
||||
button=(539, 491, 741, 555),
|
||||
),
|
||||
)
|
||||
GET_REWARD_CLOSE = ButtonWrapper(
|
||||
@@ -163,10 +179,10 @@ GET_REWARD_CLOSE = ButtonWrapper(
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/cafe/GET_REWARD_CLOSE.png',
|
||||
area=(968, 132, 997, 162),
|
||||
search=(948, 112, 1017, 182),
|
||||
color=(187, 193, 201),
|
||||
button=(968, 132, 997, 162),
|
||||
area=(883, 134, 926, 178),
|
||||
search=(863, 114, 946, 198),
|
||||
color=(215, 220, 224),
|
||||
button=(883, 134, 926, 178),
|
||||
),
|
||||
)
|
||||
GOT_REWARD = ButtonWrapper(
|
||||
@@ -180,10 +196,10 @@ GOT_REWARD = ButtonWrapper(
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/cafe/GOT_REWARD.png',
|
||||
area=(544, 493, 735, 563),
|
||||
search=(524, 473, 755, 583),
|
||||
color=(213, 213, 212),
|
||||
button=(544, 493, 735, 563),
|
||||
area=(543, 489, 741, 558),
|
||||
search=(523, 469, 761, 578),
|
||||
color=(211, 212, 212),
|
||||
button=(543, 489, 741, 558),
|
||||
),
|
||||
)
|
||||
INVENTORY = ButtonWrapper(
|
||||
@@ -212,13 +228,7 @@ INVITE_CONFIRM = ButtonWrapper(
|
||||
color=(152, 164, 177),
|
||||
button=(665, 471, 870, 533),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/cafe/INVITE_CONFIRM.png',
|
||||
area=(592, 149, 689, 176),
|
||||
search=(572, 129, 709, 196),
|
||||
color=(169, 179, 191),
|
||||
button=(664, 470, 872, 534),
|
||||
),
|
||||
en=None,
|
||||
)
|
||||
INVITE_IN_SECOND = ButtonWrapper(
|
||||
name='INVITE_IN_SECOND',
|
||||
@@ -229,13 +239,7 @@ INVITE_IN_SECOND = ButtonWrapper(
|
||||
color=(166, 177, 188),
|
||||
button=(482, 147, 799, 177),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/cafe/INVITE_IN_SECOND.png',
|
||||
area=(482, 147, 799, 177),
|
||||
search=(462, 127, 819, 197),
|
||||
color=(166, 177, 188),
|
||||
button=(482, 147, 799, 177),
|
||||
),
|
||||
en=None,
|
||||
)
|
||||
INVITE_IN_SECOND_CLOSE = ButtonWrapper(
|
||||
name='INVITE_IN_SECOND_CLOSE',
|
||||
@@ -246,13 +250,7 @@ INVITE_IN_SECOND_CLOSE = ButtonWrapper(
|
||||
color=(180, 189, 198),
|
||||
button=(874, 150, 900, 176),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/cafe/INVITE_IN_SECOND_CLOSE.png',
|
||||
area=(874, 150, 900, 176),
|
||||
search=(854, 130, 920, 196),
|
||||
color=(180, 189, 198),
|
||||
button=(874, 150, 900, 176),
|
||||
),
|
||||
en=None,
|
||||
)
|
||||
INVITE_SUBSTITUTE = ButtonWrapper(
|
||||
name='INVITE_SUBSTITUTE',
|
||||
@@ -263,13 +261,7 @@ INVITE_SUBSTITUTE = ButtonWrapper(
|
||||
color=(154, 166, 179),
|
||||
button=(673, 478, 858, 541),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/cafe/INVITE_SUBSTITUTE.png',
|
||||
area=(506, 157, 775, 186),
|
||||
search=(486, 137, 795, 206),
|
||||
color=(176, 186, 196),
|
||||
button=(673, 477, 857, 542),
|
||||
),
|
||||
en=None,
|
||||
)
|
||||
INVITE_SUBSTITUTE_CLOSE = ButtonWrapper(
|
||||
name='INVITE_SUBSTITUTE_CLOSE',
|
||||
@@ -280,13 +272,7 @@ INVITE_SUBSTITUTE_CLOSE = ButtonWrapper(
|
||||
color=(180, 189, 199),
|
||||
button=(867, 158, 893, 184),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/cafe/INVITE_SUBSTITUTE_CLOSE.png',
|
||||
area=(867, 158, 893, 184),
|
||||
search=(847, 138, 913, 204),
|
||||
color=(180, 189, 199),
|
||||
button=(867, 158, 893, 184),
|
||||
),
|
||||
en=None,
|
||||
)
|
||||
MOMOTALK_CLOSE = ButtonWrapper(
|
||||
name='MOMOTALK_CLOSE',
|
||||
@@ -314,13 +300,7 @@ MOMOTALK_INVITE = ButtonWrapper(
|
||||
color=(90, 163, 195),
|
||||
button=(764, 211, 809, 234),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/cafe/MOMOTALK_INVITE.png',
|
||||
area=(755, 210, 817, 233),
|
||||
search=(735, 190, 837, 253),
|
||||
color=(98, 179, 211),
|
||||
button=(755, 210, 817, 233),
|
||||
),
|
||||
en=None,
|
||||
)
|
||||
MOMOTALK_ITEM = ButtonWrapper(
|
||||
name='MOMOTALK_ITEM',
|
||||
@@ -331,29 +311,23 @@ MOMOTALK_ITEM = ButtonWrapper(
|
||||
color=(203, 230, 240),
|
||||
button=(489, 193, 864, 259),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/cafe/MOMOTALK_ITEM.png',
|
||||
area=(489, 193, 864, 259),
|
||||
search=(469, 173, 884, 279),
|
||||
color=(203, 230, 240),
|
||||
button=(489, 193, 864, 259),
|
||||
),
|
||||
en=None,
|
||||
)
|
||||
OCR_CAFE = ButtonWrapper(
|
||||
name='OCR_CAFE',
|
||||
jp=Button(
|
||||
file='./assets/jp/cafe/OCR_CAFE.png',
|
||||
area=(1127, 657, 1219, 682),
|
||||
search=(1107, 637, 1239, 702),
|
||||
color=(93, 112, 134),
|
||||
button=(1127, 657, 1219, 682),
|
||||
area=(1103, 642, 1202, 672),
|
||||
search=(1083, 622, 1222, 692),
|
||||
color=(87, 107, 129),
|
||||
button=(1103, 642, 1202, 672),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/cafe/OCR_CAFE.png',
|
||||
area=(1127, 657, 1219, 682),
|
||||
search=(1107, 637, 1239, 702),
|
||||
color=(93, 112, 134),
|
||||
button=(1127, 657, 1219, 682),
|
||||
area=(1105, 639, 1195, 674),
|
||||
search=(1085, 619, 1215, 694),
|
||||
color=(84, 104, 127),
|
||||
button=(1105, 639, 1195, 674),
|
||||
),
|
||||
)
|
||||
OCR_NAME = ButtonWrapper(
|
||||
@@ -365,13 +339,7 @@ OCR_NAME = ButtonWrapper(
|
||||
color=(237, 239, 241),
|
||||
button=(488, 194, 704, 588),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/cafe/OCR_NAME.png',
|
||||
area=(488, 194, 704, 588),
|
||||
search=(468, 174, 724, 608),
|
||||
color=(237, 239, 241),
|
||||
button=(488, 194, 704, 588),
|
||||
),
|
||||
en=None,
|
||||
)
|
||||
STUDENT_LIST = ButtonWrapper(
|
||||
name='STUDENT_LIST',
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
from enum import Enum
|
||||
|
||||
from module.base.decorator import Config
|
||||
from module.base.timer import Timer
|
||||
from module.logger import logger
|
||||
from module.ui.switch import Switch
|
||||
@@ -8,6 +9,10 @@ from tasks.cafe.assets.assets_cafe import *
|
||||
from tasks.cafe.invitation import handle_invitation
|
||||
from tasks.cafe.ui import CafeUI
|
||||
|
||||
SWITCH_CAFE = Switch('Cafe_switch')
|
||||
SWITCH_CAFE.add_state('off', CHANGE_CAFE_NOT_SELECTED)
|
||||
SWITCH_CAFE.add_state('on', CHANGE_CAFE_SELECTED)
|
||||
|
||||
SWITCH_CAFE_SELECT = Switch('Cafe_switch_select')
|
||||
SWITCH_CAFE_SELECT.add_state('1', CAFE_FIRST)
|
||||
SWITCH_CAFE_SELECT.add_state('2', CAFE_SECOND)
|
||||
@@ -25,10 +30,16 @@ class CafeStatus(Enum):
|
||||
|
||||
|
||||
class Cafe(CafeUI):
|
||||
@property
|
||||
def is_second_cafe_on(self):
|
||||
@Config.when(Emulator_GameLanguage='jp')
|
||||
def _is_second_cafe_on(self):
|
||||
return self.config.Cafe_SecondCafe
|
||||
|
||||
@Config.when(Emulator_GameLanguage=None)
|
||||
def _is_second_cafe_on(self):
|
||||
return False
|
||||
|
||||
is_second_cafe_on = property(_is_second_cafe_on)
|
||||
|
||||
def _handle_cafe(self, status):
|
||||
match status:
|
||||
case CafeStatus.STUDENT_LIST:
|
||||
@@ -59,7 +70,7 @@ class Cafe(CafeUI):
|
||||
if handle_invitation(self):
|
||||
return CafeStatus.CLICK
|
||||
case CafeStatus.CLICK:
|
||||
buttons = self.get_clickable_buttons()
|
||||
buttons = self.get_clickable_buttons(offset=(45, 10))
|
||||
self.click = len(buttons)
|
||||
logger.attr('Clickable', self.click)
|
||||
if not buttons:
|
||||
@@ -105,6 +116,7 @@ class Cafe(CafeUI):
|
||||
status = CafeStatus.STUDENT_LIST
|
||||
loading_timer = Timer(2).start()
|
||||
action_timer = Timer(1, count=1)
|
||||
is_list = False
|
||||
is_reset = False
|
||||
is_second = False
|
||||
is_enable = is_reward_on or is_touch_on
|
||||
@@ -121,6 +133,11 @@ class Cafe(CafeUI):
|
||||
if not loading_timer.reached():
|
||||
continue
|
||||
|
||||
if not is_list and status == CafeStatus.STUDENT_LIST and self.appear(STUDENT_LIST):
|
||||
is_list = True
|
||||
loading_timer = Timer(3).start()
|
||||
continue
|
||||
|
||||
if not is_reward_on and status == CafeStatus.OCR:
|
||||
logger.info('Skip reward')
|
||||
status = CafeStatus.CLICK
|
||||
@@ -137,19 +154,26 @@ class Cafe(CafeUI):
|
||||
continue
|
||||
|
||||
if self.is_second_cafe_on and not is_second and status == CafeStatus.FINISHED:
|
||||
if not SWITCH_CAFE_SELECT.appear(main=self):
|
||||
logger.info('Cafe switch not found')
|
||||
if not SWITCH_CAFE.appear(main=self):
|
||||
logger.warning('Cafe switch not found')
|
||||
continue
|
||||
match SWITCH_CAFE_SELECT.get(main=self):
|
||||
if SWITCH_CAFE.get(main=self) == 'off':
|
||||
SWITCH_CAFE.set('on', main=self)
|
||||
logger.info('Switching to second cafe')
|
||||
if not SWITCH_CAFE_SELECT.appear(main=self):
|
||||
logger.info('Cafe switch select not found')
|
||||
continue
|
||||
match (SWITCH_CAFE_SELECT.get(main=self)):
|
||||
case '1':
|
||||
if self.click_with_interval(CAFE_FIRST):
|
||||
if self.click_with_interval(CAFE_SECOND):
|
||||
continue
|
||||
case '2':
|
||||
logger.info('Cafe second arrived')
|
||||
SWITCH_CAFE.set('off', main=self)
|
||||
status = CafeStatus.STUDENT_LIST
|
||||
is_list = False
|
||||
is_second = True
|
||||
self.check = 0
|
||||
loading_timer.reset().start()
|
||||
|
||||
if action_timer.reached_and_reset():
|
||||
logger.attr('Status', status)
|
||||
|
||||
@@ -1,13 +1,11 @@
|
||||
import re
|
||||
from datetime import datetime, timedelta
|
||||
from enum import Enum
|
||||
|
||||
import numpy as np
|
||||
|
||||
from module.base.base import ModuleBase
|
||||
from module.base.timer import Timer
|
||||
from module.base.utils import area_offset, area_size
|
||||
from module.config.utils import get_server_next_update
|
||||
from module.base.utils import area_size, area_offset
|
||||
from module.logger import logger
|
||||
from module.ocr.ocr import Ocr
|
||||
from tasks.cafe.assets.assets_cafe import *
|
||||
@@ -34,7 +32,6 @@ class InvitationStatus(Enum):
|
||||
|
||||
class Invitation:
|
||||
swipe_vector_range = (0.65, 0.85)
|
||||
cafe_update = ["04:00", "16:00"]
|
||||
|
||||
def __init__(self, name: str):
|
||||
self.name = name
|
||||
@@ -44,7 +41,6 @@ class Invitation:
|
||||
self.invite = MOMOTALK_INVITE
|
||||
|
||||
self.target_names = []
|
||||
self.waiting_hour = None
|
||||
self.substitute = None
|
||||
self.choice = None
|
||||
|
||||
@@ -99,10 +95,6 @@ class Invitation:
|
||||
continue
|
||||
self.current_names.append((name, name_.box))
|
||||
|
||||
@property
|
||||
def is_invitation(self) -> bool:
|
||||
return get_server_next_update(self.cafe_update) - datetime.now() > timedelta(hours=self.waiting_hour)
|
||||
|
||||
@property
|
||||
def names(self):
|
||||
return list(map(lambda x: x[0], self.current_names))
|
||||
@@ -214,19 +206,16 @@ class Invitation:
|
||||
return False
|
||||
|
||||
|
||||
invitation = Invitation('CafeInvitation')
|
||||
invitation = Invitation('test')
|
||||
|
||||
|
||||
def handle_invitation_status(status: InvitationStatus, main: ModuleBase) -> InvitationStatus:
|
||||
match status:
|
||||
case InvitationStatus.MOMOTALK:
|
||||
if not invitation.is_invitation:
|
||||
logger.info('Invitation waiting until next refresh')
|
||||
return InvitationStatus.FINISHED
|
||||
if main.match_color(CAFE_INVITED):
|
||||
if main.appear(CAFE_INVITED):
|
||||
logger.info('Invitation in cooldown')
|
||||
return InvitationStatus.FINISHED
|
||||
if invitation.choice != 'list_top' and invitation.target_name is None:
|
||||
if invitation.target_name is None:
|
||||
logger.warning('No student to be invited or all invitations failed')
|
||||
return InvitationStatus.FINISHED
|
||||
if main.appear(CHECK_MOMOTALK):
|
||||
@@ -243,7 +232,7 @@ def handle_invitation_status(status: InvitationStatus, main: ModuleBase) -> Invi
|
||||
case InvitationStatus.SELECT:
|
||||
if main.appear(INVITE_CONFIRM):
|
||||
return InvitationStatus.CONFIRM
|
||||
if main.appear(INVITE_IN_SECOND):
|
||||
if main.config.Emulator_GameLanguage == 'jp' and main.appear(INVITE_IN_SECOND):
|
||||
return InvitationStatus.IN_SECOND
|
||||
if main.appear(INVITE_SUBSTITUTE):
|
||||
return InvitationStatus.SUBSTITUTE
|
||||
@@ -282,16 +271,11 @@ def handle_invitation_status(status: InvitationStatus, main: ModuleBase) -> Invi
|
||||
def handle_invitation(main: ModuleBase):
|
||||
if not main.config.Invitation_Enable:
|
||||
logger.info('Invitation disabled')
|
||||
return True
|
||||
invitation.waiting_hour = main.config.Invitation_WaitingHour
|
||||
return
|
||||
invitation.choice = main.config.Invitation_Choice
|
||||
invitation.substitute = main.config.Invitation_Substitute
|
||||
if invitation.choice is None:
|
||||
invitation.choice = main.config.Invitation_Choice
|
||||
if invitation.choice == 'by_name' and not invitation.target_names:
|
||||
name = main.config.Invitation_Name
|
||||
if name is None:
|
||||
logger.warning('Choose By Name but Inviting Student Name is blank')
|
||||
return True
|
||||
name = re.sub(r'[ \t\r\n]', '', name)
|
||||
name = re.sub(r'[＞﹥›˃ᐳ❯]', '>', name)
|
||||
name = re.sub(r'（', '(', name)
|
||||
|
||||
@@ -31,7 +31,7 @@ class CafeUI(UI):
|
||||
# generate result
|
||||
return cv2.bitwise_and(image, image, mask=mask)
|
||||
|
||||
def get_clickable_buttons(self, similarity=0.8, offset=(40, 10)):
|
||||
def get_clickable_buttons(self, similarity=0.8, offset=(45, 10)):
|
||||
image = self.extract_clickable_from_image(self.device.image)
|
||||
self.template.matched_button._button_offset = offset
|
||||
self.template.load_offset(self.template)
|
||||
|
||||
@@ -3,23 +3,6 @@ from module.base.button import Button, ButtonWrapper
|
||||
# This file was auto-generated, do not modify it manually. To generate:
|
||||
# ``` python -m dev_tools.button_extract ```
|
||||
|
||||
CIRCLE = ButtonWrapper(
|
||||
name='CIRCLE',
|
||||
jp=Button(
|
||||
file='./assets/jp/circle/CIRCLE.png',
|
||||
area=(191, 314, 233, 356),
|
||||
search=(171, 294, 253, 376),
|
||||
color=(191, 224, 240),
|
||||
button=(188, 299, 435, 456),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/circle/CIRCLE.png',
|
||||
area=(196, 314, 235, 355),
|
||||
search=(176, 294, 255, 375),
|
||||
color=(183, 221, 238),
|
||||
button=(191, 298, 434, 457),
|
||||
),
|
||||
)
|
||||
GET_REWARD_AP = ButtonWrapper(
|
||||
name='GET_REWARD_AP',
|
||||
jp=Button(
|
||||
|
||||
@@ -2,7 +2,7 @@ from enum import Enum
|
||||
|
||||
from module.base.timer import Timer
|
||||
from module.logger import logger
|
||||
from tasks.base.page import CIRCLE_CHECK, MAIN_GO_TO_CIRCLE
|
||||
from tasks.base.page import page_circle
|
||||
from tasks.base.ui import UI
|
||||
from tasks.circle.assets.assets_circle import *
|
||||
|
||||
@@ -17,19 +17,6 @@ class CircleStatus(Enum):
|
||||
|
||||
|
||||
class Circle(UI):
|
||||
def _enter_circle(self):
|
||||
self.ui_goto_main()
|
||||
action_timer = Timer(1, 8)
|
||||
while not self.appear(CIRCLE_CHECK):
|
||||
self.device.screenshot()
|
||||
if not action_timer.reached_and_reset():
|
||||
continue
|
||||
if self.appear(CIRCLE):
|
||||
self.click_with_interval(CIRCLE, 3)
|
||||
continue
|
||||
else:
|
||||
self.device.click(MAIN_GO_TO_CIRCLE)
|
||||
|
||||
def _handle_circle(self, status):
|
||||
match status:
|
||||
case CircleStatus.REWARD:
|
||||
@@ -44,7 +31,7 @@ class Circle(UI):
|
||||
return status
|
||||
|
||||
def run(self):
|
||||
self._enter_circle()
|
||||
self.ui_ensure(page_circle)
|
||||
|
||||
status = CircleStatus.REWARD
|
||||
action_timer = Timer(0.5)
|
||||
|
||||
@@ -5,35 +5,21 @@ from module.base.button import Button, ButtonWrapper
|
||||
|
||||
OCR_AP = ButtonWrapper(
|
||||
name='OCR_AP',
|
||||
jp=Button(
|
||||
file='./assets/jp/item/data/OCR_AP.png',
|
||||
area=(512, 13, 597, 32),
|
||||
search=(492, 0, 617, 52),
|
||||
color=(199, 204, 208),
|
||||
button=(512, 13, 597, 32),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/item/data/OCR_AP.png',
|
||||
area=(535, 13, 660, 36),
|
||||
search=(515, 0, 680, 56),
|
||||
color=(207, 215, 220),
|
||||
button=(535, 13, 660, 36),
|
||||
area=(560, 11, 667, 37),
|
||||
search=(540, 0, 687, 57),
|
||||
color=(211, 216, 219),
|
||||
button=(560, 11, 667, 37),
|
||||
),
|
||||
)
|
||||
OCR_DATA = ButtonWrapper(
|
||||
name='OCR_DATA',
|
||||
jp=Button(
|
||||
file='./assets/jp/item/data/OCR_DATA.png',
|
||||
area=(716, 14, 1058, 33),
|
||||
search=(696, 0, 1078, 53),
|
||||
color=(211, 219, 224),
|
||||
button=(716, 14, 1058, 33),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/item/data/OCR_DATA.png',
|
||||
area=(745, 11, 1069, 39),
|
||||
search=(725, 0, 1089, 59),
|
||||
color=(216, 223, 227),
|
||||
button=(745, 11, 1069, 39),
|
||||
area=(768, 12, 1072, 37),
|
||||
search=(748, 0, 1092, 57),
|
||||
color=(212, 220, 224),
|
||||
button=(768, 12, 1072, 37),
|
||||
),
|
||||
)
|
||||
|
||||
@@ -7,7 +7,6 @@ from tasks.base.assets.assets_base_page import BACK
|
||||
from tasks.base.page import page_school_exchange
|
||||
from tasks.scrimmage.assets.assets_scrimmage import *
|
||||
from tasks.scrimmage.ui import ScrimmageUI
|
||||
from tasks.stage.ap import AP
|
||||
|
||||
|
||||
class ScrimmageStatus(Enum):
|
||||
@@ -19,20 +18,15 @@ class ScrimmageStatus(Enum):
|
||||
FINISH = 5
|
||||
|
||||
|
||||
class Scrimmage(ScrimmageUI, AP):
|
||||
_stage_ap = [10, 15, 15, 15]
|
||||
|
||||
@property
|
||||
def stage_ap(self):
|
||||
return self._stage_ap
|
||||
|
||||
class Scrimmage(ScrimmageUI):
|
||||
@property
|
||||
def scrimmage_info(self):
|
||||
scrimmage = (SELECT_TRINITY, SELECT_GEHENNA, SELECT_MILLENNIUM)
|
||||
check = (CHECK_TRINITY, CHECK_GEHENNA, CHECK_MILLENNIUM)
|
||||
stage = (self.config.Trinity_Stage, self.config.Gehenna_Stage, self.config.Millennium_Stage)
|
||||
count = (self.config.Trinity_Count, self.config.Gehenna_Count, self.config.Millennium_Count)
|
||||
info = zip(scrimmage, check, stage, count)
|
||||
ap = (10 if stage == 1 else 15 for stage in stage)
|
||||
info = zip(scrimmage, check, stage, count, ap)
|
||||
return filter(lambda x: x[3] > 0, info)
|
||||
|
||||
@property
|
||||
@@ -56,6 +50,10 @@ class Scrimmage(ScrimmageUI, AP):
|
||||
def is_ticket_enough(self) -> bool:
|
||||
return self.current_ticket >= self.current_count
|
||||
|
||||
@property
|
||||
def is_ap_enough(self) -> bool:
|
||||
return self.current_ap >= self.current_task_ap
|
||||
|
||||
@property
|
||||
def current_scrimmage(self):
|
||||
return self.task[0][:2]
|
||||
@@ -68,10 +66,25 @@ class Scrimmage(ScrimmageUI, AP):
|
||||
def current_count(self):
|
||||
return self.task[0][3]
|
||||
|
||||
@property
|
||||
def current_task_ap(self):
|
||||
return self.task[0][4] * self.current_count
|
||||
|
||||
@property
|
||||
def current_ticket(self):
|
||||
return self.config.stored.ScrimmageTicket.value
|
||||
|
||||
@property
|
||||
def current_ap(self):
|
||||
return self.config.stored.AP.value
|
||||
|
||||
def update_ap(self):
|
||||
ap = self.config.stored.AP
|
||||
ap_old = ap.value
|
||||
ap_new = ap_old - self.current_task_ap
|
||||
ap.set(ap_new, ap.total)
|
||||
logger.info(f'Set AP: {ap_old} -> {ap_new}')
|
||||
|
||||
def handle_scrimmage(self, status):
|
||||
match status:
|
||||
case ScrimmageStatus.OCR:
|
||||
@@ -83,16 +96,19 @@ class Scrimmage(ScrimmageUI, AP):
|
||||
if not self.is_ticket_enough:
|
||||
logger.warning('Scrimmage ticket not enough')
|
||||
self.error_handler()
|
||||
if not self.is_ap_enough:
|
||||
logger.warning('AP not enough')
|
||||
self.error_handler()
|
||||
if self.select_scrimmage(*self.current_scrimmage):
|
||||
return ScrimmageStatus.ENTER
|
||||
case ScrimmageStatus.ENTER:
|
||||
if self.enter_stage(self.current_stage) and self.is_ap_enough(self.current_count, self.current_stage):
|
||||
if self.enter_stage(self.current_stage):
|
||||
return ScrimmageStatus.SWEEP
|
||||
else:
|
||||
self.error_handler()
|
||||
case ScrimmageStatus.SWEEP:
|
||||
if self.do_sweep(self.current_count):
|
||||
self.update_ap(self.current_count, self.current_stage)
|
||||
self.update_ap()
|
||||
self.task.pop(0)
|
||||
return ScrimmageStatus.END
|
||||
return ScrimmageStatus.ENTER
|
||||
|
||||
@@ -3,7 +3,6 @@ from module.logger import logger
|
||||
from module.ocr.ocr import DigitCounter
|
||||
from tasks.base.ui import UI
|
||||
from tasks.scrimmage.assets.assets_scrimmage import *
|
||||
from tasks.stage.ap import AP
|
||||
from tasks.stage.list import StageList
|
||||
from tasks.stage.sweep import StageSweep
|
||||
|
||||
@@ -11,7 +10,7 @@ SCRIMMAGE_LIST = StageList('ScrimmageList')
|
||||
SCRIMMAGE_SWEEP = StageSweep('ScrimmageSweep', 6)
|
||||
|
||||
|
||||
class ScrimmageUI(UI, AP):
|
||||
class ScrimmageUI(UI):
|
||||
def select_scrimmage(self, dest_enter: ButtonWrapper, dest_check: ButtonWrapper):
|
||||
timer = Timer(5, 10).start()
|
||||
while 1:
|
||||
@@ -23,10 +22,6 @@ class ScrimmageUI(UI, AP):
|
||||
return False
|
||||
|
||||
def enter_stage(self, index: int) -> bool:
|
||||
if not index:
|
||||
index = SCRIMMAGE_LIST.insight_max_sweepable_index(self)
|
||||
# set AP stage
|
||||
self.set_stage(index)
|
||||
if SCRIMMAGE_LIST.select_index_enter(self, index, insight=False):
|
||||
return True
|
||||
return False
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
from module.base.base import ModuleBase
|
||||
from module.logger import logger
|
||||
|
||||
|
||||
class AP(ModuleBase):
|
||||
_stage = 0
|
||||
|
||||
@property
|
||||
def stage(self) -> int:
|
||||
return self._stage
|
||||
|
||||
@classmethod
|
||||
def set_stage(cls, stage: int):
|
||||
cls._stage = stage
|
||||
|
||||
@property
|
||||
def stage_ap(self) -> int | list:
|
||||
"""
|
||||
To be redefined in subclass.
|
||||
|
||||
Returns:
|
||||
Task ap
|
||||
"""
|
||||
return 0
|
||||
|
||||
@property
|
||||
def current_ap(self):
|
||||
return self.config.stored.AP.value
|
||||
|
||||
def update_ap(self, count: int, stage: int = None):
|
||||
ap = self.config.stored.AP
|
||||
ap_old = ap.value
|
||||
ap_new = ap_old - self.stage_ap_cost(stage) * count
|
||||
ap.set(ap_new, ap.total)
|
||||
logger.info(f'Set AP: {ap_old} -> {ap_new}')
|
||||
|
||||
def stage_ap_cost(self, stage: int = None) -> int:
|
||||
if isinstance(self.stage_ap, int):
|
||||
return self.stage_ap
|
||||
if isinstance(self.stage_ap, list):
|
||||
if not stage:
|
||||
stage = self.stage if self.stage else len(self.stage_ap)
|
||||
return self.stage_ap[stage - 1]
|
||||
|
||||
def is_ap_enough(self, count: int, stage: int = None) -> bool:
|
||||
cost = self.stage_ap_cost(stage) * count
|
||||
logger.info(f'Check AP: {self.current_ap} / {cost}')
|
||||
return self.current_ap >= cost
|
||||
@@ -1,5 +1,3 @@
|
||||
import re
|
||||
|
||||
import numpy as np
|
||||
|
||||
from module.base.base import ModuleBase
|
||||
@@ -33,7 +31,7 @@ class StageList:
|
||||
|
||||
self.current_index_min = 1
|
||||
self.current_index_max = 1
|
||||
self.current_indexes: list[tuple[str, tuple]] = []
|
||||
self.current_indexes = []
|
||||
|
||||
def __str__(self):
|
||||
return f'StageList({self.name})'
|
||||
@@ -48,14 +46,11 @@ class StageList:
|
||||
|
||||
@property
|
||||
def _indexes(self) -> list[int]:
|
||||
return [int(x[0]) for x in self.current_indexes]
|
||||
return list(map(lambda x: int(x.ocr_text), self.current_indexes))
|
||||
|
||||
def load_stage_indexes(self, main: ModuleBase):
|
||||
self.current_indexes = list(
|
||||
filter(
|
||||
lambda x: re.match(r'^\d{1,2}-?\d?$', x[0]) and x[0] != '00',
|
||||
map(lambda x: (x.ocr_text, x.box), self.index_ocr.detect_and_ocr(main.device.image))
|
||||
)
|
||||
filter(lambda x: x.ocr_text.isdigit(), self.index_ocr.detect_and_ocr(main.device.image))
|
||||
)
|
||||
if not self.current_indexes:
|
||||
logger.warning(f'No valid index in {self.index_ocr.name}')
|
||||
@@ -131,79 +126,13 @@ class StageList:
|
||||
timeout=Timer(1.5, 5)
|
||||
)
|
||||
|
||||
def insight_max_sweepable_index(self, main: ModuleBase, skip_first_screenshot=True) -> int:
|
||||
"""
|
||||
Args:
|
||||
main:
|
||||
skip_first_screenshot:
|
||||
|
||||
Returns:
|
||||
Index of max sweepable stage
|
||||
"""
|
||||
logger.info('Insight sweepable index')
|
||||
max_sweepable_index = 0
|
||||
last_max_sweepable_index = 0
|
||||
|
||||
while 1:
|
||||
if skip_first_screenshot:
|
||||
skip_first_screenshot = False
|
||||
else:
|
||||
main.device.screenshot()
|
||||
|
||||
self.load_stage_indexes(main=main)
|
||||
|
||||
sweepable_index = next(
|
||||
filter(
|
||||
lambda x: not self.is_sweepable(main, self.search_box(x[-1][:2])),
|
||||
self.current_indexes
|
||||
), None
|
||||
)
|
||||
|
||||
# all sweepable
|
||||
if sweepable_index is None:
|
||||
logger.info('All sweepable')
|
||||
max_sweepable_index = self.current_index_max
|
||||
self.swipe_page(self.swipe_direction, main)
|
||||
if max_sweepable_index == last_max_sweepable_index:
|
||||
logger.info(f'Max sweepable index: {max_sweepable_index}')
|
||||
return max_sweepable_index
|
||||
last_max_sweepable_index = max_sweepable_index
|
||||
# all not sweepable
|
||||
elif int(sweepable_index[0]) == self.current_index_min:
|
||||
logger.info('All not sweepable')
|
||||
if int(sweepable_index[0]) == 1:
|
||||
logger.warning('No sweepable index')
|
||||
return 0
|
||||
self.swipe_page(self.swipe_direction, main, reverse=True)
|
||||
else:
|
||||
logger.info(f'Sweepable index: {int(sweepable_index[0]) - 1}')
|
||||
return int(sweepable_index[0]) - 1
|
||||
|
||||
main.wait_until_stable(
|
||||
self.stage.button,
|
||||
timer=Timer(0, 0),
|
||||
timeout=Timer(1.5, 5)
|
||||
)
|
||||
|
||||
def is_sweepable(self, main: ModuleBase, search_box) -> bool:
|
||||
self.sweepable.load_search(search_box)
|
||||
return main.appear(self.sweepable, similarity=0.8)
|
||||
|
||||
def search_box(
|
||||
self,
|
||||
index_cord: tuple[int, int],
|
||||
padding: tuple[int, int] = (-20, -15)
|
||||
) -> tuple[int, int, int, int]:
|
||||
stage_item_box = area_pad((*padding, *area_size(self.stage_item)))
|
||||
return area_offset(stage_item_box, index_cord)
|
||||
|
||||
def select_index_enter(
|
||||
self,
|
||||
main: ModuleBase,
|
||||
index: int,
|
||||
insight: bool = True,
|
||||
sweepable: bool = True,
|
||||
padding: tuple[int, int] = (-20, -15),
|
||||
offset: tuple[int, int] = (-20, -15),
|
||||
skip_first_screenshot: bool = True,
|
||||
interval: int = 1.5
|
||||
) -> bool:
|
||||
@@ -221,18 +150,21 @@ class StageList:
|
||||
main.device.screenshot()
|
||||
|
||||
# load index if not insight
|
||||
if load_index_interval.reached_and_reset():
|
||||
if load_index_interval.reached_and_reset() and not insight:
|
||||
self.load_stage_indexes(main=main)
|
||||
|
||||
# find box of index
|
||||
index_box = next(filter(lambda x: int(x[0]) == index, self.current_indexes), None)
|
||||
index_box = next(filter(lambda x: int(x.ocr_text) == index, self.current_indexes), None)
|
||||
|
||||
if index_box is None:
|
||||
logger.warning(f'No index {index} in {self.index_ocr.name}')
|
||||
continue
|
||||
|
||||
search_box = self.search_box(index_box[-1][:2], padding)
|
||||
if sweepable and not self.is_sweepable(main, search_box):
|
||||
stage_item_box = area_pad((*offset, *area_size(self.stage_item)))
|
||||
search_box = area_offset(stage_item_box, index_box.box[:2])
|
||||
self.sweepable.load_search(search_box)
|
||||
|
||||
if sweepable and not main.appear(self.sweepable):
|
||||
logger.warning(f'Index {index} is not sweepable')
|
||||
return False
|
||||
|
||||
|
||||
@@ -133,9 +133,9 @@ PLAYER_SELECT_FIRST = ButtonWrapper(
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/tactical_challenge/PLAYER_SELECT_FIRST.png',
|
||||
area=(468, 296, 493, 315),
|
||||
search=(448, 276, 513, 335),
|
||||
color=(191, 202, 207),
|
||||
area=(470, 293, 503, 322),
|
||||
search=(450, 273, 523, 342),
|
||||
color=(206, 214, 220),
|
||||
button=(606, 181, 1100, 256),
|
||||
),
|
||||
)
|
||||
@@ -150,9 +150,9 @@ PLAYER_SELECT_SECOND = ButtonWrapper(
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/tactical_challenge/PLAYER_SELECT_SECOND.png',
|
||||
area=(467, 454, 493, 473),
|
||||
search=(447, 434, 513, 493),
|
||||
color=(191, 202, 207),
|
||||
area=(467, 450, 507, 482),
|
||||
search=(447, 430, 527, 502),
|
||||
color=(210, 219, 225),
|
||||
button=(610, 338, 1098, 407),
|
||||
),
|
||||
)
|
||||
@@ -167,9 +167,9 @@ PLAYER_SELECT_THIRD = ButtonWrapper(
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/tactical_challenge/PLAYER_SELECT_THIRD.png',
|
||||
area=(468, 613, 492, 631),
|
||||
search=(448, 593, 512, 651),
|
||||
color=(188, 199, 204),
|
||||
area=(472, 612, 504, 641),
|
||||
search=(452, 592, 524, 661),
|
||||
color=(208, 216, 222),
|
||||
button=(609, 500, 1101, 565),
|
||||
),
|
||||
)
|
||||
|
||||
@@ -41,8 +41,6 @@ class TacticalChallenge(TacticalChallengeUI):
|
||||
def _handle_challenge(self, status):
|
||||
match status:
|
||||
case TCStatus.REWARD:
|
||||
if self.ui_additional():
|
||||
return status
|
||||
if self.get_reward():
|
||||
return TCStatus.OCR
|
||||
case TCStatus.OCR:
|
||||
|
||||