mirror of
https://github.com/TheFunny/ArisuAutoSweeper
synced 2025-12-19 23:45:24 +00:00
resolved conflicts
This commit is contained in:
parent
a41e49e30b
commit
0dc82cf948
@ -8,8 +8,8 @@ class ManualConfig:
|
|||||||
|
|
||||||
SCHEDULER_PRIORITY = """
|
SCHEDULER_PRIORITY = """
|
||||||
Restart
|
Restart
|
||||||
> Cafe > Circle > Mail > DataUpdate > Bounty
|
> Cafe > TacticalChallenge > Circle > Mail
|
||||||
> Scrimmage > TacticalChallenge > Task > Shop > Momotalk
|
> DataUpdate > Bounty > Scrimmage > Task > Shop > Momotalk
|
||||||
"""
|
"""
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|||||||
@ -21,7 +21,7 @@ class ShopUI(UI):
|
|||||||
super().__init__(config, device)
|
super().__init__(config, device)
|
||||||
|
|
||||||
self.click_coords = self.device.click_methods.get(self.config.Emulator_ControlMethod, self.device.click_adb)
|
self.click_coords = self.device.click_methods.get(self.config.Emulator_ControlMethod, self.device.click_adb)
|
||||||
self.swipe_vector_range = (1.10, 1.15)
|
self.swipe_vector_range = (0.85, 0.9)
|
||||||
self.swipe_flags = {8:False, 16: False}
|
self.swipe_flags = {8:False, 16: False}
|
||||||
self.list = ITEM_LIST
|
self.list = ITEM_LIST
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user