File tree Expand file tree Collapse file tree 1 file changed +8
-2
lines changed Expand file tree Collapse file tree 1 file changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -245,7 +245,7 @@ def overtake_room(self):
245
245
):
246
246
break
247
247
if current_resting - len (remove_name ) + required > len (
248
- self .op_data .drom
248
+ self .op_data .dorm
249
249
):
250
250
msg = f"无法完成 { self .task .meta_data } 的排班,宿舍可用空位不足,请减少使用回满词条"
251
251
send_message (msg , level = "ERROR" )
@@ -1697,7 +1697,10 @@ def resting_new(self):
1697
1697
_replacement = []
1698
1698
_plan = {}
1699
1699
for op in self .total_agent :
1700
- if current_resting + len (_replacement ) >= self .ideal_resting_count :
1700
+ if (
1701
+ current_resting + len (_replacement ) >= self .ideal_resting_count
1702
+ and self .op_data .available_free () >= self .ideal_resting_count
1703
+ ):
1701
1704
break
1702
1705
if op .name in self .op_data .workaholic_agent :
1703
1706
continue
@@ -1710,6 +1713,9 @@ def resting_new(self):
1710
1713
# 忽略掉心情太高的
1711
1714
if op .upper_limit - op .current_mood () < 2 :
1712
1715
continue
1716
+ # 忽略 用尽,已经处理
1717
+ if op .name in self .op_data .exhaust_agent :
1718
+ continue
1713
1719
# 忽略掉心情值没低于上限的的
1714
1720
if op .current_mood () > int (
1715
1721
(op .upper_limit - op .lower_limit )
You can’t perform that action at this time.
0 commit comments