1
0
mirror of https://github.com/TheFunny/ArisuAutoSweeper synced 2025-12-16 22:05:12 +00:00

Compare commits

...

4 Commits

8 changed files with 20 additions and 27 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

View File

@ -218,7 +218,7 @@
}, },
"SecondCafe": { "SecondCafe": {
"name": "Second Floor", "name": "Second Floor",
"help": "JP server only\nEnable auto switch to second floor and perform interaction" "help": "Enable auto switch to second floor and perform interaction"
} }
}, },
"Invitation": { "Invitation": {

View File

@ -218,7 +218,7 @@
}, },
"SecondCafe": { "SecondCafe": {
"name": "第二咖啡厅", "name": "第二咖啡厅",
"help": "仅支持日服\n自动切换第二咖啡厅进行互动点击" "help": "自动切换第二咖啡厅进行互动点击"
} }
}, },
"Invitation": { "Invitation": {

View File

@ -34,10 +34,10 @@ CAFE_FIRST = ButtonWrapper(
), ),
en=Button( en=Button(
file='./assets/en/cafe/CAFE_FIRST.png', file='./assets/en/cafe/CAFE_FIRST.png',
area=(82, 152, 136, 175), area=(100, 156, 148, 175),
search=(62, 132, 156, 195), search=(80, 136, 168, 195),
color=(111, 127, 147), color=(107, 123, 144),
button=(82, 152, 136, 175), button=(100, 156, 148, 175),
), ),
) )
CAFE_INVITE = ButtonWrapper( CAFE_INVITE = ButtonWrapper(
@ -85,10 +85,10 @@ CAFE_SECOND = ButtonWrapper(
), ),
en=Button( en=Button(
file='./assets/en/cafe/CAFE_SECOND.png', file='./assets/en/cafe/CAFE_SECOND.png',
area=(219, 152, 279, 175), area=(242, 157, 291, 174),
search=(199, 132, 299, 195), search=(222, 137, 311, 194),
color=(110, 126, 146), color=(119, 134, 153),
button=(219, 152, 279, 175), button=(242, 157, 291, 174),
), ),
) )
CHANGE_CAFE_NOT_SELECTED = ButtonWrapper( CHANGE_CAFE_NOT_SELECTED = ButtonWrapper(
@ -102,10 +102,10 @@ CHANGE_CAFE_NOT_SELECTED = ButtonWrapper(
), ),
en=Button( en=Button(
file='./assets/en/cafe/CHANGE_CAFE_NOT_SELECTED.png', file='./assets/en/cafe/CHANGE_CAFE_NOT_SELECTED.png',
area=(84, 89, 178, 109), area=(99, 93, 197, 110),
search=(64, 69, 198, 129), search=(79, 73, 217, 130),
color=(185, 193, 203), color=(179, 187, 196),
button=(84, 89, 178, 109), button=(99, 93, 197, 110),
), ),
) )
CHANGE_CAFE_SELECTED = ButtonWrapper( CHANGE_CAFE_SELECTED = ButtonWrapper(
@ -119,10 +119,10 @@ CHANGE_CAFE_SELECTED = ButtonWrapper(
), ),
en=Button( en=Button(
file='./assets/en/cafe/CHANGE_CAFE_SELECTED.png', file='./assets/en/cafe/CHANGE_CAFE_SELECTED.png',
area=(40, 87, 191, 112), area=(57, 92, 199, 112),
search=(20, 67, 211, 132), search=(37, 72, 219, 132),
color=(82, 105, 130), color=(92, 115, 140),
button=(40, 87, 191, 112), button=(57, 92, 199, 112),
), ),
) )
CHECK_MOMOTALK = ButtonWrapper( CHECK_MOMOTALK = ButtonWrapper(

View File

@ -1,6 +1,5 @@
from enum import Enum from enum import Enum
from module.base.decorator import Config
from module.base.timer import Timer from module.base.timer import Timer
from module.logger import logger from module.logger import logger
from module.ui.switch import Switch from module.ui.switch import Switch
@ -30,16 +29,10 @@ class CafeStatus(Enum):
class Cafe(CafeUI): class Cafe(CafeUI):
@Config.when(Emulator_GameLanguage='jp') @property
def _is_second_cafe_on(self): def is_second_cafe_on(self):
return self.config.Cafe_SecondCafe 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): def _handle_cafe(self, status):
match status: match status:
case CafeStatus.STUDENT_LIST: case CafeStatus.STUDENT_LIST: