|
@@ -4,22 +4,22 @@
|
|
|
from module.logger import logger
|
|
from module.logger import logger
|
|
|
|
|
|
|
|
from tasks.RichMan.mall.special import Special
|
|
from tasks.RichMan.mall.special import Special
|
|
|
-from tasks.RichMan.mall.honor import Honor
|
|
|
|
|
from tasks.RichMan.mall.friendship_points import FriendshipPoints
|
|
from tasks.RichMan.mall.friendship_points import FriendshipPoints
|
|
|
from tasks.RichMan.mall.medal import Medal
|
|
from tasks.RichMan.mall.medal import Medal
|
|
|
from tasks.RichMan.mall.charisma import Charisma
|
|
from tasks.RichMan.mall.charisma import Charisma
|
|
|
from tasks.RichMan.mall.consignment import Consignment
|
|
from tasks.RichMan.mall.consignment import Consignment
|
|
|
from tasks.RichMan.mall.scales import Scales
|
|
from tasks.RichMan.mall.scales import Scales
|
|
|
|
|
+from tasks.RichMan.mall.honor import Honor
|
|
|
from tasks.RichMan.mall.bondlings import Bondlings
|
|
from tasks.RichMan.mall.bondlings import Bondlings
|
|
|
from tasks.GameUi.page import page_main, page_mall
|
|
from tasks.GameUi.page import page_main, page_mall
|
|
|
|
|
|
|
|
-class Mall(Special, Honor, FriendshipPoints, Medal, Charisma, Consignment, Scales, Bondlings):
|
|
|
|
|
|
|
+class Mall(Medal, Charisma, Honor, Consignment, Scales, Bondlings):
|
|
|
|
|
|
|
|
|
|
|
|
|
def execute_mall(self):
|
|
def execute_mall(self):
|
|
|
logger.hr('Mall', 1)
|
|
logger.hr('Mall', 1)
|
|
|
self.ui_get_current_page()
|
|
self.ui_get_current_page()
|
|
|
- self.ui_goto(page_mall, confirm_wait=4)
|
|
|
|
|
|
|
+ self.ui_goto(page_mall, confirm_wait=2.5)
|
|
|
|
|
|
|
|
# 寄售屋
|
|
# 寄售屋
|
|
|
self.execute_consignment()
|
|
self.execute_consignment()
|
|
@@ -29,6 +29,7 @@ class Mall(Special, Honor, FriendshipPoints, Medal, Charisma, Consignment, Scale
|
|
|
self.execute_bondlings()
|
|
self.execute_bondlings()
|
|
|
|
|
|
|
|
# 杂货铺
|
|
# 杂货铺
|
|
|
|
|
+ self.execute_special()
|
|
|
self.execute_honor()
|
|
self.execute_honor()
|
|
|
self.execute_friendship()
|
|
self.execute_friendship()
|
|
|
self.execute_medal()
|
|
self.execute_medal()
|