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

Merge pull request #5587 from LmeSzinc/dev

Browse Source 
Bug fix
This commit is contained in:
LmeSzinc
2026-04-01 01:18:17 +08:00
committed by GitHub
parent 433059bc8e 032b2c1931
commit 1e67ed613a
8 changed files with 65 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/cn/shop/SHOP_REFRESH_CHECK.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
assets/en/shop/SHOP_REFRESH.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.7 KiB

54
config/template.json
View File

@@ -125,12 +125,12 @@
"Mode": "calculate",
"Fleet1Value": 119,
"Fleet1Record": "2020-01-01 00:00:00",
"Fleet1Control": "prevent_yellow_face",
"Fleet1Control": "prevent_green_face",
"Fleet1Recover": "not_in_dormitory",
"Fleet1Oath": false,
"Fleet2Value": 119,
"Fleet2Record": "2020-01-01 00:00:00",
"Fleet2Control": "prevent_yellow_face",
"Fleet2Control": "prevent_green_face",
"Fleet2Recover": "not_in_dormitory",
"Fleet2Oath": false
},
@@ -199,12 +199,12 @@
"Mode": "calculate",
"Fleet1Value": 119,
"Fleet1Record": "2020-01-01 00:00:00",
"Fleet1Control": "prevent_yellow_face",
"Fleet1Control": "prevent_green_face",
"Fleet1Recover": "not_in_dormitory",
"Fleet1Oath": false,
"Fleet2Value": 119,
"Fleet2Record": "2020-01-01 00:00:00",
"Fleet2Control": "prevent_yellow_face",
"Fleet2Control": "prevent_green_face",
"Fleet2Recover": "not_in_dormitory",
"Fleet2Oath": false
},
@@ -273,12 +273,12 @@
"Mode": "calculate",
"Fleet1Value": 119,
"Fleet1Record": "2020-01-01 00:00:00",
"Fleet1Control": "prevent_yellow_face",
"Fleet1Control": "prevent_green_face",
"Fleet1Recover": "not_in_dormitory",
"Fleet1Oath": false,
"Fleet2Value": 119,
"Fleet2Record": "2020-01-01 00:00:00",
"Fleet2Control": "prevent_yellow_face",
"Fleet2Control": "prevent_green_face",
"Fleet2Recover": "not_in_dormitory",
"Fleet2Oath": false
},
@@ -409,12 +409,12 @@
"Mode": "calculate",
"Fleet1Value": 119,
"Fleet1Record": "2020-01-01 00:00:00",
"Fleet1Control": "prevent_yellow_face",
"Fleet1Control": "prevent_green_face",
"Fleet1Recover": "not_in_dormitory",
"Fleet1Oath": false,
"Fleet2Value": 119,
"Fleet2Record": "2020-01-01 00:00:00",
"Fleet2Control": "prevent_yellow_face",
"Fleet2Control": "prevent_green_face",
"Fleet2Recover": "not_in_dormitory",
"Fleet2Oath": false
},
@@ -483,12 +483,12 @@
"Mode": "calculate",
"Fleet1Value": 119,
"Fleet1Record": "2020-01-01 00:00:00",
"Fleet1Control": "prevent_yellow_face",
"Fleet1Control": "prevent_green_face",
"Fleet1Recover": "not_in_dormitory",
"Fleet1Oath": false,
"Fleet2Value": 119,
"Fleet2Record": "2020-01-01 00:00:00",
"Fleet2Control": "prevent_yellow_face",
"Fleet2Control": "prevent_green_face",
"Fleet2Recover": "not_in_dormitory",
"Fleet2Oath": false
},
@@ -544,7 +544,7 @@
"Mode": "calculate",
"Fleet1Value": 119,
"Fleet1Record": "2020-01-01 00:00:00",
"Fleet1Control": "prevent_yellow_face",
"Fleet1Control": "prevent_green_face",
"Fleet1Recover": "not_in_dormitory",
"Fleet1Oath": false,
"Fleet2Value": 119,
@@ -629,7 +629,7 @@
"Mode": "calculate",
"Fleet1Value": 119,
"Fleet1Record": "2020-01-01 00:00:00",
"Fleet1Control": "prevent_yellow_face",
"Fleet1Control": "prevent_green_face",
"Fleet1Recover": "not_in_dormitory",
"Fleet1Oath": false,
"Fleet2Value": 119,
@@ -706,12 +706,12 @@
"Mode": "calculate",
"Fleet1Value": 119,
"Fleet1Record": "2020-01-01 00:00:00",
"Fleet1Control": "prevent_yellow_face",
"Fleet1Control": "prevent_green_face",
"Fleet1Recover": "not_in_dormitory",
"Fleet1Oath": false,
"Fleet2Value": 119,
"Fleet2Record": "2020-01-01 00:00:00",
"Fleet2Control": "prevent_yellow_face",
"Fleet2Control": "prevent_green_face",
"Fleet2Recover": "not_in_dormitory",
"Fleet2Oath": false
},
@@ -784,12 +784,12 @@
"Mode": "calculate",
"Fleet1Value": 119,
"Fleet1Record": "2020-01-01 00:00:00",
"Fleet1Control": "prevent_yellow_face",
"Fleet1Control": "prevent_green_face",
"Fleet1Recover": "not_in_dormitory",
"Fleet1Oath": false,
"Fleet2Value": 119,
"Fleet2Record": "2020-01-01 00:00:00",
"Fleet2Control": "prevent_yellow_face",
"Fleet2Control": "prevent_green_face",
"Fleet2Recover": "not_in_dormitory",
"Fleet2Oath": false
},
@@ -862,12 +862,12 @@
"Mode": "calculate",
"Fleet1Value": 119,
"Fleet1Record": "2020-01-01 00:00:00",
"Fleet1Control": "prevent_yellow_face",
"Fleet1Control": "prevent_green_face",
"Fleet1Recover": "not_in_dormitory",
"Fleet1Oath": false,
"Fleet2Value": 119,
"Fleet2Record": "2020-01-01 00:00:00",
"Fleet2Control": "prevent_yellow_face",
"Fleet2Control": "prevent_green_face",
"Fleet2Recover": "not_in_dormitory",
"Fleet2Oath": false
},
@@ -940,12 +940,12 @@
"Mode": "calculate",
"Fleet1Value": 119,
"Fleet1Record": "2020-01-01 00:00:00",
"Fleet1Control": "prevent_yellow_face",
"Fleet1Control": "prevent_green_face",
"Fleet1Recover": "not_in_dormitory",
"Fleet1Oath": false,
"Fleet2Value": 119,
"Fleet2Record": "2020-01-01 00:00:00",
"Fleet2Control": "prevent_yellow_face",
"Fleet2Control": "prevent_green_face",
"Fleet2Recover": "not_in_dormitory",
"Fleet2Oath": false
},
@@ -1018,12 +1018,12 @@
"Mode": "calculate",
"Fleet1Value": 119,
"Fleet1Record": "2020-01-01 00:00:00",
"Fleet1Control": "prevent_yellow_face",
"Fleet1Control": "prevent_green_face",
"Fleet1Recover": "not_in_dormitory",
"Fleet1Oath": false,
"Fleet2Value": 119,
"Fleet2Record": "2020-01-01 00:00:00",
"Fleet2Control": "prevent_yellow_face",
"Fleet2Control": "prevent_green_face",
"Fleet2Recover": "not_in_dormitory",
"Fleet2Oath": false
},
@@ -1092,12 +1092,12 @@
"Mode": "calculate",
"Fleet1Value": 119,
"Fleet1Record": "2020-01-01 00:00:00",
"Fleet1Control": "prevent_yellow_face",
"Fleet1Control": "prevent_green_face",
"Fleet1Recover": "not_in_dormitory",
"Fleet1Oath": false,
"Fleet2Value": 119,
"Fleet2Record": "2020-01-01 00:00:00",
"Fleet2Control": "prevent_yellow_face",
"Fleet2Control": "prevent_green_face",
"Fleet2Recover": "not_in_dormitory",
"Fleet2Oath": false
},
@@ -1152,7 +1152,7 @@
"Mode": "calculate",
"Fleet1Value": 119,
"Fleet1Record": "2020-01-01 00:00:00",
"Fleet1Control": "prevent_yellow_face",
"Fleet1Control": "prevent_green_face",
"Fleet1Recover": "not_in_dormitory",
"Fleet1Oath": false,
"Fleet2Value": 119,
@@ -1200,7 +1200,7 @@
"Mode": "calculate",
"Fleet1Value": 119,
"Fleet1Record": "2020-01-01 00:00:00",
"Fleet1Control": "prevent_yellow_face",
"Fleet1Control": "prevent_green_face",
"Fleet1Recover": "not_in_dormitory",
"Fleet1Oath": false,
"Fleet2Value": 119,
@@ -1253,7 +1253,7 @@
},
"AddNewStudent": {
"Enable": false,
"Favorite": true,
"Favorite": false,
"MinLevel": 50
},
"Storage": {

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

@@ -694,7 +694,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -727,7 +727,7 @@
},
"Fleet2Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -1073,7 +1073,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -1106,7 +1106,7 @@
},
"Fleet2Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -1452,7 +1452,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -1485,7 +1485,7 @@
},
"Fleet2Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -2168,7 +2168,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -2201,7 +2201,7 @@
},
"Fleet2Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -2565,7 +2565,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -2598,7 +2598,7 @@
},
"Fleet2Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -2848,7 +2848,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -3267,7 +3267,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -3884,7 +3884,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -3917,7 +3917,7 @@
},
"Fleet2Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -4298,7 +4298,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -4331,7 +4331,7 @@
},
"Fleet2Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -4712,7 +4712,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -4745,7 +4745,7 @@
},
"Fleet2Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -5126,7 +5126,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -5159,7 +5159,7 @@
},
"Fleet2Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -5540,7 +5540,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -5573,7 +5573,7 @@
},
"Fleet2Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -5945,7 +5945,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -5978,7 +5978,7 @@
},
"Fleet2Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -6219,7 +6219,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -6466,7 +6466,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -6685,7 +6685,7 @@
},
"Favorite": {
"type": "checkbox",
"value": true
"value": false
},
"MinLevel": {
"type": "input",

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

@@ -217,7 +217,7 @@ Emotion:
value: 2020-01-01 00:00:00
display: disabled
Fleet1Control:
value: prevent_yellow_face
value: prevent_green_face
option: [ keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face ]
Fleet1Recover:
value: not_in_dormitory
@@ -228,7 +228,7 @@ Emotion:
value: 2020-01-01 00:00:00
display: disabled
Fleet2Control:
value: prevent_yellow_face
value: prevent_green_face
option: [ keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face ]
Fleet2Recover:
value: not_in_dormitory
@@ -362,7 +362,7 @@ ControlExpOverflow:
T1Allow: 200
AddNewStudent:
Enable: false
Favorite: true
Favorite: false
MinLevel: 50
Research:
UseCube:

6
module/config/config_generated.py
View File

@@ -111,12 +111,12 @@ class GeneratedConfig:
Emotion_Mode = 'calculate' # calculate, ignore, calculate_ignore
Emotion_Fleet1Value = 119
Emotion_Fleet1Record = datetime.datetime(2020, 1, 1, 0, 0)
Emotion_Fleet1Control = 'prevent_yellow_face' # keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face
Emotion_Fleet1Control = 'prevent_green_face' # keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face
Emotion_Fleet1Recover = 'not_in_dormitory' # not_in_dormitory, dormitory_floor_1, dormitory_floor_2
Emotion_Fleet1Oath = False
Emotion_Fleet2Value = 119
Emotion_Fleet2Record = datetime.datetime(2020, 1, 1, 0, 0)
Emotion_Fleet2Control = 'prevent_yellow_face' # keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face
Emotion_Fleet2Control = 'prevent_green_face' # keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face
Emotion_Fleet2Recover = 'not_in_dormitory' # not_in_dormitory, dormitory_floor_1, dormitory_floor_2
Emotion_Fleet2Oath = False
@@ -201,7 +201,7 @@ class GeneratedConfig:
# Group `AddNewStudent`
AddNewStudent_Enable = False
AddNewStudent_Favorite = True
AddNewStudent_Favorite = False
AddNewStudent_MinLevel = 50
# Group `Research`

3
module/shop/assets.py
View File

@@ -23,7 +23,8 @@ SHOP_GOLD_COINS = Button(area={'cn': (815, 23, 922, 51), 'en': (815, 23, 922, 51
SHOP_OCR_BALANCE = Button(area={'cn': (972, 164, 1052, 189), 'en': (972, 164, 1052, 189), 'jp': (972, 164, 1052, 189), 'tw': (972, 164, 1052, 189)}, color={'cn': (193, 204, 210), 'en': (193, 204, 210), 'jp': (193, 204, 210), 'tw': (193, 204, 210)}, button={'cn': (972, 164, 1052, 189), 'en': (972, 164, 1052, 189), 'jp': (972, 164, 1052, 189), 'tw': (972, 164, 1052, 189)}, file={'cn': './assets/cn/shop/SHOP_OCR_BALANCE.png', 'en': './assets/en/shop/SHOP_OCR_BALANCE.png', 'jp': './assets/cn/shop/SHOP_OCR_BALANCE.png', 'tw': './assets/cn/shop/SHOP_OCR_BALANCE.png'})
SHOP_OCR_OIL = Button(area={'cn': (700, 23, 785, 47), 'en': (863, 24, 955, 46), 'jp': (700, 23, 785, 47), 'tw': (700, 23, 785, 47)}, color={'cn': (150, 185, 194), 'en': (150, 183, 189), 'jp': (150, 185, 194), 'tw': (150, 185, 194)}, button={'cn': (700, 23, 785, 47), 'en': (863, 24, 955, 46), 'jp': (700, 23, 785, 47), 'tw': (700, 23, 785, 47)}, file={'cn': './assets/cn/shop/SHOP_OCR_OIL.png', 'en': './assets/en/shop/SHOP_OCR_OIL.png', 'jp': './assets/cn/shop/SHOP_OCR_OIL.png', 'tw': './assets/tw/shop/SHOP_OCR_OIL.png'})
SHOP_OCR_OIL_CHECK = Button(area={'cn': (666, 30, 682, 43), 'en': (834, 25, 854, 45), 'jp': (666, 30, 682, 43), 'tw': (666, 30, 682, 43)}, color={'cn': (73, 73, 73), 'en': (71, 75, 75), 'jp': (73, 73, 73), 'tw': (73, 73, 73)}, button={'cn': (666, 30, 682, 43), 'en': (834, 25, 854, 45), 'jp': (666, 30, 682, 43), 'tw': (666, 30, 682, 43)}, file={'cn': './assets/cn/shop/SHOP_OCR_OIL_CHECK.png', 'en': './assets/en/shop/SHOP_OCR_OIL_CHECK.png', 'jp': './assets/cn/shop/SHOP_OCR_OIL_CHECK.png', 'tw': './assets/tw/shop/SHOP_OCR_OIL_CHECK.png'})
SHOP_REFRESH = Button(area={'cn': (1001, 653, 1070, 690), 'en': (1001, 653, 1070, 690), 'jp': (1001, 653, 1070, 690), 'tw': (1001, 653, 1070, 690)}, color={'cn': (65, 150, 212), 'en': (65, 150, 212), 'jp': (65, 150, 212), 'tw': (65, 150, 212)}, button={'cn': (1001, 653, 1070, 690), 'en': (1001, 653, 1070, 690), 'jp': (1001, 653, 1070, 690), 'tw': (1001, 653, 1070, 690)}, file={'cn': './assets/cn/shop/SHOP_REFRESH.png', 'en': './assets/en/shop/SHOP_REFRESH.png', 'jp': './assets/cn/shop/SHOP_REFRESH.png', 'tw': './assets/cn/shop/SHOP_REFRESH.png'})
SHOP_REFRESH = Button(area={'cn': (1001, 653, 1070, 690), 'en': (1001, 653, 1070, 690), 'jp': (1001, 653, 1070, 690), 'tw': (1001, 653, 1070, 690)}, color={'cn': (65, 150, 212), 'en': (65, 150, 212), 'jp': (65, 150, 212), 'tw': (65, 150, 212)}, button={'cn': (1001, 653, 1070, 690), 'en': (1001, 653, 1070, 690), 'jp': (1001, 653, 1070, 690), 'tw': (1001, 653, 1070, 690)}, file={'cn': './assets/cn/shop/SHOP_REFRESH.png', 'en': './assets/cn/shop/SHOP_REFRESH.png', 'jp': './assets/cn/shop/SHOP_REFRESH.png', 'tw': './assets/cn/shop/SHOP_REFRESH.png'})
SHOP_REFRESH_CHECK = Button(area={'cn': (1024, 660, 1048, 684), 'en': (1024, 660, 1048, 684), 'jp': (1024, 660, 1048, 684), 'tw': (1024, 660, 1048, 684)}, color={'cn': (131, 170, 197), 'en': (131, 170, 197), 'jp': (131, 170, 197), 'tw': (131, 170, 197)}, button={'cn': (1024, 660, 1048, 684), 'en': (1024, 660, 1048, 684), 'jp': (1024, 660, 1048, 684), 'tw': (1024, 660, 1048, 684)}, file={'cn': './assets/cn/shop/SHOP_REFRESH_CHECK.png', 'en': './assets/cn/shop/SHOP_REFRESH_CHECK.png', 'jp': './assets/cn/shop/SHOP_REFRESH_CHECK.png', 'tw': './assets/cn/shop/SHOP_REFRESH_CHECK.png'})
SHOP_SELECT_PR1 = Button(area={'cn': (182, 212, 308, 339), 'en': (182, 212, 308, 339), 'jp': (182, 212, 308, 339), 'tw': (182, 212, 308, 339)}, color={'cn': (157, 158, 143), 'en': (157, 158, 143), 'jp': (157, 158, 143), 'tw': (157, 158, 143)}, button={'cn': (182, 212, 308, 339), 'en': (182, 212, 308, 339), 'jp': (182, 212, 308, 339), 'tw': (182, 212, 308, 339)}, file={'cn': './assets/cn/shop/SHOP_SELECT_PR1.png', 'en': './assets/en/shop/SHOP_SELECT_PR1.png', 'jp': './assets/jp/shop/SHOP_SELECT_PR1.png', 'tw': './assets/tw/shop/SHOP_SELECT_PR1.png'})
SHOP_SELECT_PR2 = Button(area={'cn': (182, 212, 310, 340), 'en': (182, 212, 310, 340), 'jp': (182, 212, 310, 340), 'tw': (182, 212, 310, 340)}, color={'cn': (160, 159, 145), 'en': (160, 159, 145), 'jp': (160, 159, 145), 'tw': (160, 159, 145)}, button={'cn': (182, 212, 310, 340), 'en': (182, 212, 310, 340), 'jp': (182, 212, 310, 340), 'tw': (182, 212, 310, 340)}, file={'cn': './assets/cn/shop/SHOP_SELECT_PR2.png', 'en': './assets/en/shop/SHOP_SELECT_PR2.png', 'jp': './assets/jp/shop/SHOP_SELECT_PR2.png', 'tw': './assets/tw/shop/SHOP_SELECT_PR2.png'})
SHOP_SELECT_PR3 = Button(area={'cn': (180, 212, 309, 340), 'en': (180, 212, 309, 340), 'jp': (180, 212, 309, 340), 'tw': (180, 212, 309, 340)}, color={'cn': (156, 156, 142), 'en': (156, 156, 142), 'jp': (156, 156, 142), 'tw': (156, 156, 142)}, button={'cn': (180, 212, 309, 340), 'en': (180, 212, 309, 340), 'jp': (180, 212, 309, 340), 'tw': (180, 212, 309, 340)}, file={'cn': './assets/cn/shop/SHOP_SELECT_PR3.png', 'en': './assets/en/shop/SHOP_SELECT_PR3.png', 'jp': './assets/jp/shop/SHOP_SELECT_PR3.png', 'tw': './assets/tw/shop/SHOP_SELECT_PR3.png'})

4
module/shop/ui.py
View File

@@ -83,7 +83,9 @@ class ShopUI(UI):
for _ in self.loop():
if self.appear(POPUP_CONFIRM, offset=(30, 30)):
break
if self.appear(SHOP_REFRESH, offset=(30, 30), interval=3):
# SHOP_REFRESH_CHECK is the refresh icon
# SHOP_REFRESH is refresh icon with surrounded background
if self.appear(SHOP_REFRESH_CHECK, offset=(30, 30), interval=3):
# SHOP_REFRESH has two kinds of color when active
if self.image_color_count(SHOP_REFRESH.button, color=(49, 142, 207), threshold=221, count=50):
self.device.click(SHOP_REFRESH)