From 92e1e6eefd8558e76fc8e5bca64c7729eb623c88 Mon Sep 17 00:00:00 2001
From: drway <78285587+drway@users.noreply.github.com>
Date: Mon, 5 Jan 2026 20:31:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=86=AC=E6=97=B6?=
 =?UTF-8?q?=E8=87=B3=E5=9F=BA=E5=BB=BA=E6=B8=A9=E8=92=82=E7=BB=84=E5=B9=B6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B8=A9=E8=92=82=E7=BB=84=E9=80=89=E4=BA=BA?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=20(#15294)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 修正了温蒂组: 2电站效率

将温蒂组: 2电站时效率由 30% 修正到了正确的 20%。

* feat: 增加冬时至基建温蒂组并调整温蒂组选人逻辑

将冬时-1加入温蒂组的换班逻辑中。
考虑到现在 冬时-1 + 森蚺/异客2 + 清流-1 也可以构成温蒂组，新增逻辑“冬时组”，加入了上述换班逻辑。
将温蒂/森蚺-2的权重上调至30.2（考虑到温蒂/森蚺2可受晨曦格雷伊加成），在选人时会优先选择温蒂/森蚺-2而不是冬时。
---
 resource/infrast.json | 98 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 94 insertions(+), 4 deletions(-)

diff --git a/resource/infrast.json b/resource/infrast.json
index 5739492d3f..6b834bc78b 100644
--- a/resource/infrast.json
+++ b/resource/infrast.json
@@ -2127,10 +2127,17 @@
                     {
                         "desc": "森蚺-2",
                         "efficient": {
-                            "all": 30
+                            "all": 30.2
                         },
                         "skills": ["bskill_man_spd&power2"]
                     },
+                    {
+                        "desc": "冬时-1",
+                        "efficient": {
+                            "all": 30
+                        },
+                        "skills": ["bskill_man_spd_manu2"]
+                    },
                     {
                         "desc": "清流-1",
                         "efficient": {
@@ -2156,7 +2163,7 @@
                     {
                         "desc": "温蒂、森蚺-2",
                         "efficient": {
-                            "all": 30
+                            "all": 30.2
                         },
                         "skills": ["bskill_man_spd&power2"]
                     }
@@ -2165,10 +2172,17 @@
                     {
                         "desc": "温蒂、森蚺-2",
                         "efficient": {
-                            "all": 30
+                            "all": 30.2
                         },
                         "skills": ["bskill_man_spd&power2"]
                     },
+                    {
+                        "desc": "冬时-1",
+                        "efficient": {
+                            "all": 30
+                        },
+                        "skills": ["bskill_man_spd_manu2"]
+                    },
                     {
                         "desc": "清流-1",
                         "efficient": {
@@ -2200,6 +2214,13 @@
                     }
                 ],
                 "optional": [
+                    {
+                        "desc": "冬时-1",
+                        "efficient": {
+                            "all": 30
+                        },
+                        "skills": ["bskill_man_spd_manu2"]
+                    },
                     {
                         "desc": "森蚺-2",
                         "efficient": {
@@ -2232,12 +2253,19 @@
                     {
                         "desc": "温蒂、森蚺-2",
                         "efficient": {
-                            "all": 30
+                            "all": 20
                         },
                         "skills": ["bskill_man_spd&power2"]
                     }
                 ],
                 "optional": [
+                    {
+                        "desc": "冬时-1",
+                        "efficient": {
+                            "all": 30
+                        },
+                        "skills": ["bskill_man_spd_manu2"]
+                    },
                     {
                         "desc": "温蒂、森蚺-2",
                         "efficient": {
@@ -2260,6 +2288,68 @@
                         "skills": ["bskill_man_spd&power1"]
                     }
                 ]
+            },
+            {
+                "conditions": {
+                    "NumOfPower": 3
+                },
+                "desc": "冬时组",
+                "necessary": [
+                    {
+                        "desc": "冬时-1",
+                        "efficient": {
+                            "all": 30
+                        },
+                        "skills": ["bskill_man_spd_manu2"]
+                    }
+                ],
+                "optional": [
+                    {
+                        "desc": "清流-1",
+                        "efficient": {
+                            "PureGold_reg": "[NumOfTrade] * 20"
+                        },
+                        "skills": ["bskill_man_spd&trade"]
+                    },
+                    {
+                        "desc": "森蚺、异客2",
+                        "efficient": {
+                            "all": 15
+                        },
+                        "skills": ["bskill_man_spd&power1"]
+                    }
+                ]
+            },
+            {
+                "conditions": {
+                    "NumOfPower": 2
+                },
+                "desc": "冬时组: 2电站",
+                "necessary": [
+                    {
+                        "desc": "冬时-1",
+                        "efficient": {
+                            "all": 30
+                        },
+                        "skills": ["bskill_man_spd_manu2"]
+                    }
+                ],
+                "optional": [
+                    {
+                        "desc": "清流-1",
+                        "efficient": {
+                            "PureGold_reg": "[NumOfTrade] * 20"
+                        },
+                        "skills": ["bskill_man_spd&trade"]
+                    },
+                    {
+                        "desc": "森蚺、异客2",
+                        "efficient": {
+                            "all": 10
+                        },
+                        "skills": ["bskill_man_spd&power1"]
+                    }
+                ]
             }
         ],
         "skillsGroup_Doc": "相关技能组参考https://bbs.nga.cn/read.php?tid=25965441"