From 36096c6a382f1334146143ad0badb0468a559923 Mon Sep 17 00:00:00 2001
From: yzh <yuzuhang@bantus.cn>
Date: Wed, 26 Jul 2023 19:36:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E5=80=BC=EF=BC=9A=E5=90=8C=E6=AD=A5co?=
 =?UTF-8?q?ndition=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/resource/jsons/dic_war_conditions.json | 427 +++++++++++++++++-
 1 file changed, 413 insertions(+), 14 deletions(-)

diff --git a/shared/resource/jsons/dic_war_conditions.json b/shared/resource/jsons/dic_war_conditions.json
index e9de006d3..2c471247e 100644
--- a/shared/resource/jsons/dic_war_conditions.json
+++ b/shared/resource/jsons/dic_war_conditions.json
@@ -289,9 +289,9 @@
     {
         "id": 42,
         "warid": 308,
-        "c_type": 106,
-        "data": "15&",
-        "describe": "15回合内获得胜利"
+        "c_type": 115,
+        "data": "2&2&2",
+        "describe": "击杀两名窃贼"
     },
     {
         "id": 43,
@@ -451,8 +451,8 @@
         "id": 65,
         "warid": 416,
         "c_type": 106,
-        "data": "12&",
-        "describe": "12回合内获得胜利"
+        "data": "15&",
+        "describe": "15回合内获得胜利"
     },
     {
         "id": 66,
@@ -1087,9 +1087,9 @@
     {
         "id": 156,
         "warid": 1308,
-        "c_type": 106,
-        "data": "15&",
-        "describe": "15回合内获得胜利"
+        "c_type": 115,
+        "data": "2&2&2",
+        "describe": "击杀两名窃贼"
     },
     {
         "id": 157,
@@ -1228,8 +1228,8 @@
         "id": 176,
         "warid": 1412,
         "c_type": 106,
-        "data": "10&",
-        "describe": "10回合内获得胜利"
+        "data": "12&",
+        "describe": "12回合内获得胜利"
     },
     {
         "id": 177,
@@ -1249,8 +1249,8 @@
         "id": 179,
         "warid": 1416,
         "c_type": 106,
-        "data": "12&",
-        "describe": "12回合内获得胜利"
+        "data": "15&",
+        "describe": "15回合内获得胜利"
     },
     {
         "id": 180,
@@ -1529,8 +1529,8 @@
         "id": 219,
         "warid": 1616,
         "c_type": 106,
-        "data": "15&",
-        "describe": "15回合内获得胜利"
+        "data": "17&",
+        "describe": "17回合内获得胜利"
     },
     {
         "id": 220,
@@ -3722,5 +3722,404 @@
         "c_type": 106,
         "data": "20&",
         "describe": "20回合内获得胜利"
+    },
+    {
+        "id": 533,
+        "warid": 804,
+        "c_type": 302,
+        "data": "99&",
+        "describe": "取得胜利"
+    },
+    {
+        "id": 534,
+        "warid": 804,
+        "c_type": 102,
+        "data": "0&",
+        "describe": "我方无人撤离"
+    },
+    {
+        "id": 535,
+        "warid": 804,
+        "c_type": 106,
+        "data": "16&",
+        "describe": "16回合内获得胜利"
+    },
+    {
+        "id": 536,
+        "warid": 808,
+        "c_type": 302,
+        "data": "99&",
+        "describe": "取得胜利"
+    },
+    {
+        "id": 537,
+        "warid": 808,
+        "c_type": 102,
+        "data": "0&",
+        "describe": "我方无人撤离"
+    },
+    {
+        "id": 538,
+        "warid": 808,
+        "c_type": 106,
+        "data": "18&",
+        "describe": "18回合内获得胜利"
+    },
+    {
+        "id": 539,
+        "warid": 812,
+        "c_type": 302,
+        "data": "99&",
+        "describe": "取得胜利"
+    },
+    {
+        "id": 540,
+        "warid": 812,
+        "c_type": 102,
+        "data": "0&",
+        "describe": "我方无人撤离"
+    },
+    {
+        "id": 541,
+        "warid": 812,
+        "c_type": 106,
+        "data": "15&",
+        "describe": "15回合内获得胜利"
+    },
+    {
+        "id": 542,
+        "warid": 816,
+        "c_type": 302,
+        "data": "99&",
+        "describe": "取得胜利"
+    },
+    {
+        "id": 543,
+        "warid": 816,
+        "c_type": 102,
+        "data": "0&",
+        "describe": "我方无人撤离"
+    },
+    {
+        "id": 544,
+        "warid": 816,
+        "c_type": 106,
+        "data": "24&",
+        "describe": "24回合内获得胜利"
+    },
+    {
+        "id": 545,
+        "warid": 820,
+        "c_type": 302,
+        "data": "99&",
+        "describe": "取得胜利"
+    },
+    {
+        "id": 546,
+        "warid": 820,
+        "c_type": 102,
+        "data": "0&",
+        "describe": "我方无人撤离"
+    },
+    {
+        "id": 547,
+        "warid": 820,
+        "c_type": 106,
+        "data": "18&",
+        "describe": "18回合内获得胜利"
+    },
+    {
+        "id": 548,
+        "warid": 824,
+        "c_type": 302,
+        "data": "99&",
+        "describe": "取得胜利"
+    },
+    {
+        "id": 549,
+        "warid": 824,
+        "c_type": 102,
+        "data": "0&",
+        "describe": "我方无人撤离"
+    },
+    {
+        "id": 550,
+        "warid": 824,
+        "c_type": 106,
+        "data": "15&",
+        "describe": "15回合内获得胜利"
+    },
+    {
+        "id": 551,
+        "warid": 828,
+        "c_type": 302,
+        "data": "99&",
+        "describe": "取得胜利"
+    },
+    {
+        "id": 552,
+        "warid": 828,
+        "c_type": 102,
+        "data": "0&",
+        "describe": "我方无人撤离"
+    },
+    {
+        "id": 553,
+        "warid": 828,
+        "c_type": 106,
+        "data": "20&",
+        "describe": "20回合内获得胜利"
+    },
+    {
+        "id": 554,
+        "warid": 1804,
+        "c_type": 302,
+        "data": "99&",
+        "describe": "取得胜利"
+    },
+    {
+        "id": 555,
+        "warid": 1804,
+        "c_type": 102,
+        "data": "0&",
+        "describe": "我方无人撤离"
+    },
+    {
+        "id": 556,
+        "warid": 1804,
+        "c_type": 106,
+        "data": "16&",
+        "describe": "16回合内获得胜利"
+    },
+    {
+        "id": 557,
+        "warid": 1808,
+        "c_type": 302,
+        "data": "99&",
+        "describe": "取得胜利"
+    },
+    {
+        "id": 558,
+        "warid": 1808,
+        "c_type": 102,
+        "data": "0&",
+        "describe": "我方无人撤离"
+    },
+    {
+        "id": 559,
+        "warid": 1808,
+        "c_type": 106,
+        "data": "18&",
+        "describe": "18回合内获得胜利"
+    },
+    {
+        "id": 560,
+        "warid": 1812,
+        "c_type": 302,
+        "data": "99&",
+        "describe": "取得胜利"
+    },
+    {
+        "id": 561,
+        "warid": 1812,
+        "c_type": 102,
+        "data": "0&",
+        "describe": "我方无人撤离"
+    },
+    {
+        "id": 562,
+        "warid": 1812,
+        "c_type": 106,
+        "data": "15&",
+        "describe": "15回合内获得胜利"
+    },
+    {
+        "id": 563,
+        "warid": 1816,
+        "c_type": 302,
+        "data": "99&",
+        "describe": "取得胜利"
+    },
+    {
+        "id": 564,
+        "warid": 1816,
+        "c_type": 102,
+        "data": "0&",
+        "describe": "我方无人撤离"
+    },
+    {
+        "id": 565,
+        "warid": 1816,
+        "c_type": 106,
+        "data": "24&",
+        "describe": "24回合内获得胜利"
+    },
+    {
+        "id": 566,
+        "warid": 1820,
+        "c_type": 302,
+        "data": "99&",
+        "describe": "取得胜利"
+    },
+    {
+        "id": 567,
+        "warid": 1820,
+        "c_type": 102,
+        "data": "0&",
+        "describe": "我方无人撤离"
+    },
+    {
+        "id": 568,
+        "warid": 1820,
+        "c_type": 106,
+        "data": "18&",
+        "describe": "18回合内获得胜利"
+    },
+    {
+        "id": 569,
+        "warid": 1824,
+        "c_type": 302,
+        "data": "99&",
+        "describe": "取得胜利"
+    },
+    {
+        "id": 570,
+        "warid": 1824,
+        "c_type": 102,
+        "data": "0&",
+        "describe": "我方无人撤离"
+    },
+    {
+        "id": 571,
+        "warid": 1824,
+        "c_type": 106,
+        "data": "15&",
+        "describe": "15回合内获得胜利"
+    },
+    {
+        "id": 572,
+        "warid": 1828,
+        "c_type": 302,
+        "data": "99&",
+        "describe": "取得胜利"
+    },
+    {
+        "id": 573,
+        "warid": 1828,
+        "c_type": 102,
+        "data": "0&",
+        "describe": "我方无人撤离"
+    },
+    {
+        "id": 574,
+        "warid": 1828,
+        "c_type": 106,
+        "data": "15&",
+        "describe": "15回合内获得胜利"
+    },
+    {
+        "id": 575,
+        "warid": 5070,
+        "c_type": 302,
+        "data": "99&",
+        "describe": "取得胜利"
+    },
+    {
+        "id": 576,
+        "warid": 5070,
+        "c_type": 102,
+        "data": "0&",
+        "describe": "我方无人撤离"
+    },
+    {
+        "id": 577,
+        "warid": 5070,
+        "c_type": 106,
+        "data": "15&",
+        "describe": "15回合内获得胜利"
+    },
+    {
+        "id": 578,
+        "warid": 5071,
+        "c_type": 302,
+        "data": "99&",
+        "describe": "取得胜利"
+    },
+    {
+        "id": 579,
+        "warid": 5071,
+        "c_type": 102,
+        "data": "0&",
+        "describe": "我方无人撤离"
+    },
+    {
+        "id": 580,
+        "warid": 5071,
+        "c_type": 106,
+        "data": "15&",
+        "describe": "15回合内获得胜利"
+    },
+    {
+        "id": 581,
+        "warid": 5072,
+        "c_type": 302,
+        "data": "99&",
+        "describe": "取得胜利"
+    },
+    {
+        "id": 582,
+        "warid": 5072,
+        "c_type": 102,
+        "data": "0&",
+        "describe": "我方无人撤离"
+    },
+    {
+        "id": 583,
+        "warid": 5072,
+        "c_type": 106,
+        "data": "15&",
+        "describe": "15回合内获得胜利"
+    },
+    {
+        "id": 584,
+        "warid": 5073,
+        "c_type": 302,
+        "data": "99&",
+        "describe": "取得胜利"
+    },
+    {
+        "id": 585,
+        "warid": 5073,
+        "c_type": 102,
+        "data": "0&",
+        "describe": "我方无人撤离"
+    },
+    {
+        "id": 586,
+        "warid": 5073,
+        "c_type": 106,
+        "data": "15&",
+        "describe": "15回合内获得胜利"
+    },
+    {
+        "id": 587,
+        "warid": 5074,
+        "c_type": 302,
+        "data": "99&",
+        "describe": "取得胜利"
+    },
+    {
+        "id": 588,
+        "warid": 5074,
+        "c_type": 102,
+        "data": "0&",
+        "describe": "我方无人撤离"
+    },
+    {
+        "id": 589,
+        "warid": 5074,
+        "c_type": 106,
+        "data": "15&",
+        "describe": "15回合内获得胜利"
     }
 ]
\ No newline at end of file