Просмотр исходного кода

fix(CollectiveMissions): Add new mission type 'Goryou Three'

runhey 3 лет назад
Родитель
Сommit
92badbc00d
2 измененных файлов с 6 добавлено и 2 удалено
  1. 1 1
      tasks/CollectiveMissions/config.py
  2. 5 1
      tasks/CollectiveMissions/script_task.py

+ 1 - 1
tasks/CollectiveMissions/config.py

@@ -14,7 +14,7 @@ from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
 
 class MissionsConfig(BaseModel):
     # 契灵 > 觉醒二 > 觉醒一 > 御灵二 > 御灵一 > 御魂五 > 御魂四
-    missions_rule: MultiLine = Field(default='契灵 > 觉醒三 > 觉醒二 > 觉醒一 > 御灵二 > 御灵一 > 御魂二 > 御魂一',
+    missions_rule: MultiLine = Field(default='契灵 > 觉醒三 > 觉醒二 > 觉醒一 > 御灵三 > 御灵二 > 御灵一 > 御魂二 > 御魂一',
                                      description='missions_rule_help')
 
     @validator('missions_rule', pre=True, always=True)

+ 5 - 1
tasks/CollectiveMissions/script_task.py

@@ -25,6 +25,7 @@ class MC(str, Enum):
     AW3 = '觉醒三'
     GR1 = '御灵一'
     GR2 = '御灵二'
+    GR3 = '御灵三'
     SO1 = '御魂一'
     SO2 = '御魂二'
     FRIEND = '好友'
@@ -64,7 +65,8 @@ class ScriptTask(GameUi, CollectiveMissionsAssets):
         if mission == MC.BL:
             # 契灵单独处理
             self._bondling_fairyland(index)
-        elif mission == MC.AW1 or mission == MC.AW2 or mission == MC.AW3 or mission == MC.GR1 or mission == MC.GR2:
+        elif mission == MC.AW1 or mission == MC.AW2 or mission == MC.AW3 \
+                or mission == MC.GR1 or mission == MC.GR2 or mission == MC.GR3:
             # 其他就捐材料
             self._donate(index)
         elif mission == MC.SO1 or mission == MC.SO2:
@@ -114,6 +116,8 @@ class ScriptTask(GameUi, CollectiveMissionsAssets):
             return MC.GR1
         elif result_2 == '御灵二':
             return MC.GR2
+        elif result_2 == '御灵三':
+            return MC.GR3
         elif result_2 == '御魂一':
             return MC.SO1
         elif result_2 == '御魂二':