Skip to content

Commit 2f49f93

Browse files
committed
wip: refactor workflow
1 parent f6bf137 commit 2f49f93

16 files changed

Lines changed: 17 additions & 83 deletions

File tree

-9.57 KB
Binary file not shown.
-7.17 KB
Binary file not shown.
-9.57 KB
Binary file not shown.
-7.17 KB
Binary file not shown.
-9.57 KB
Binary file not shown.
-7.17 KB
Binary file not shown.

config/template.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,8 +1292,7 @@
12921292
"Dorm": {
12931293
"Collect": true,
12941294
"Feed": true,
1295-
"FeedFilter": "20000 > 10000 > 5000 > 3000 > 2000 > 1000",
1296-
"BuyFood": false
1295+
"FeedFilter": "20000 > 10000 > 5000 > 3000 > 2000 > 1000"
12971296
},
12981297
"BuyFurniture": {
12991298
"Enable": false,

module/commission/commission.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -556,13 +556,14 @@ def commission_receive(self, skip_first_screenshot=True):
556556
# no need to reset click_timer, just instant click REWARD_1
557557
# click_timer.reset()
558558
continue
559-
if self.appear(FUEL_MAXED):
560-
logger.info("Fuel maxed, skip reward receive")
561-
self.config.cross_set('Dorm.Dorm.BuyFood', True)
562-
self.config.task_call('Dorm')
563-
self.config.task_delay(minute=1)
564-
self.config.task_stop()
565-
break
559+
if self.config.SERVER in ['jp']:
560+
if self.appear(FUEL_MAXED):
561+
logger.info("Fuel maxed, skip reward receive")
562+
self.config.cross_set('Dorm.Dorm.BuyFood', True)
563+
self.config.task_call('Dorm')
564+
self.config.task_delay(minute=1)
565+
self.config.task_stop()
566+
break
566567
# Check GET_SHIP at last to handle random white background at page_main
567568
for button in [GET_SHIP]:
568569
if click_timer.reached() and self.appear(button, interval=1):

module/config/argument/args.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6860,11 +6860,6 @@
68606860
"FeedFilter": {
68616861
"type": "textarea",
68626862
"value": "20000 > 10000 > 5000 > 3000 > 2000 > 1000"
6863-
},
6864-
"BuyFood": {
6865-
"type": "checkbox",
6866-
"value": false,
6867-
"display": "disabled"
68686863
}
68696864
},
68706865
"BuyFurniture": {

module/config/argument/argument.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -410,9 +410,6 @@ Dorm:
410410
Collect: true
411411
Feed: true
412412
FeedFilter: 20000 > 10000 > 5000 > 3000 > 2000 > 1000
413-
BuyFood:
414-
value: false
415-
display: disabled
416413
BuyFurniture:
417414
Enable: false
418415
BuyOption:

0 commit comments

Comments
 (0)