diff --git a/assets/cn/shop/SHOP_REFRESH_CHECK.png b/assets/cn/shop/SHOP_REFRESH_CHECK.png new file mode 100644 index 000000000..b834760ad Binary files /dev/null and b/assets/cn/shop/SHOP_REFRESH_CHECK.png differ diff --git a/assets/en/shop/SHOP_REFRESH.png b/assets/en/shop/SHOP_REFRESH.png deleted file mode 100644 index 3e485eb71..000000000 Binary files a/assets/en/shop/SHOP_REFRESH.png and /dev/null differ diff --git a/config/template.json b/config/template.json index 18cc6c40f..d06f58ed9 100644 --- a/config/template.json +++ b/config/template.json @@ -198,13 +198,13 @@ "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, "Fleet1Onsen": false, "Fleet2Value": 119, "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", + "Fleet2Control": "prevent_green_face", "Fleet2Recover": "not_in_dormitory", "Fleet2Oath": false, "Fleet2Onsen": false @@ -276,13 +276,13 @@ "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, "Fleet1Onsen": false, "Fleet2Value": 119, "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", + "Fleet2Control": "prevent_green_face", "Fleet2Recover": "not_in_dormitory", "Fleet2Oath": false, "Fleet2Onsen": false @@ -354,13 +354,13 @@ "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, "Fleet1Onsen": false, "Fleet2Value": 119, "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", + "Fleet2Control": "prevent_green_face", "Fleet2Recover": "not_in_dormitory", "Fleet2Oath": false, "Fleet2Onsen": false @@ -524,13 +524,13 @@ "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, "Fleet1Onsen": false, "Fleet2Value": 119, "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", + "Fleet2Control": "prevent_green_face", "Fleet2Recover": "not_in_dormitory", "Fleet2Oath": false, "Fleet2Onsen": false @@ -602,13 +602,13 @@ "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, "Fleet1Onsen": false, "Fleet2Value": 119, "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", + "Fleet2Control": "prevent_green_face", "Fleet2Recover": "not_in_dormitory", "Fleet2Oath": false, "Fleet2Onsen": false @@ -666,7 +666,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, "Fleet1Onsen": false, @@ -756,7 +756,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, "Fleet1Onsen": false, @@ -840,13 +840,13 @@ "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, "Fleet1Onsen": false, "Fleet2Value": 119, "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", + "Fleet2Control": "prevent_green_face", "Fleet2Recover": "not_in_dormitory", "Fleet2Oath": false, "Fleet2Onsen": false @@ -922,13 +922,13 @@ "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, "Fleet1Onsen": false, "Fleet2Value": 119, "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", + "Fleet2Control": "prevent_green_face", "Fleet2Recover": "not_in_dormitory", "Fleet2Oath": false, "Fleet2Onsen": false @@ -1004,13 +1004,13 @@ "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, "Fleet1Onsen": false, "Fleet2Value": 119, "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", + "Fleet2Control": "prevent_green_face", "Fleet2Recover": "not_in_dormitory", "Fleet2Oath": false, "Fleet2Onsen": false @@ -1086,13 +1086,13 @@ "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, "Fleet1Onsen": false, "Fleet2Value": 119, "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", + "Fleet2Control": "prevent_green_face", "Fleet2Recover": "not_in_dormitory", "Fleet2Oath": false, "Fleet2Onsen": false @@ -1168,13 +1168,13 @@ "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, "Fleet1Onsen": false, "Fleet2Value": 119, "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", + "Fleet2Control": "prevent_green_face", "Fleet2Recover": "not_in_dormitory", "Fleet2Oath": false, "Fleet2Onsen": false @@ -1246,13 +1246,13 @@ "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, "Fleet1Onsen": false, "Fleet2Value": 119, "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", + "Fleet2Control": "prevent_green_face", "Fleet2Recover": "not_in_dormitory", "Fleet2Oath": false, "Fleet2Onsen": false @@ -1309,7 +1309,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, "Fleet1Onsen": false, @@ -1360,7 +1360,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, "Fleet1Onsen": false, @@ -1415,7 +1415,7 @@ }, "AddNewStudent": { "Enable": false, - "Favorite": true, + "Favorite": false, "MinLevel": 50 }, "Storage": { diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 4a64a05ae..cc2e2a37f 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -939,7 +939,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -976,7 +976,7 @@ }, "Fleet2Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -1335,7 +1335,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -1372,7 +1372,7 @@ }, "Fleet2Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -1731,7 +1731,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -1768,7 +1768,7 @@ }, "Fleet2Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -2640,7 +2640,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -2677,7 +2677,7 @@ }, "Fleet2Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -3054,7 +3054,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -3091,7 +3091,7 @@ }, "Fleet2Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -3351,7 +3351,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -3795,7 +3795,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -4436,7 +4436,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -4473,7 +4473,7 @@ }, "Fleet2Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -4868,7 +4868,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -4905,7 +4905,7 @@ }, "Fleet2Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -5300,7 +5300,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -5337,7 +5337,7 @@ }, "Fleet2Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -5732,7 +5732,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -5769,7 +5769,7 @@ }, "Fleet2Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -6164,7 +6164,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -6201,7 +6201,7 @@ }, "Fleet2Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -6587,7 +6587,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -6624,7 +6624,7 @@ }, "Fleet2Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -6875,7 +6875,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -7137,7 +7137,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -7363,7 +7363,7 @@ }, "Favorite": { "type": "checkbox", - "value": true + "value": false }, "MinLevel": { "type": "input", diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index 75553dced..548cbee67 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -228,7 +228,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 @@ -240,7 +240,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 @@ -401,7 +401,7 @@ ControlExpOverflow: T1Allow: 200 AddNewStudent: Enable: false - Favorite: true + Favorite: false MinLevel: 50 Research: UseCube: diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 0cc5c4e33..a4057058c 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -119,13 +119,13 @@ 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_Fleet1Onsen = 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 Emotion_Fleet2Onsen = False @@ -222,7 +222,7 @@ class GeneratedConfig: # Group `AddNewStudent` AddNewStudent_Enable = False - AddNewStudent_Favorite = True + AddNewStudent_Favorite = False AddNewStudent_MinLevel = 50 # Group `Research` diff --git a/module/shop/assets.py b/module/shop/assets.py index e48cb50b6..db7b7791d 100644 --- a/module/shop/assets.py +++ b/module/shop/assets.py @@ -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'}) diff --git a/module/shop/ui.py b/module/shop/ui.py index dc4bf9022..93b011bbd 100644 --- a/module/shop/ui.py +++ b/module/shop/ui.py @@ -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)