diff --git a/shared/resource/jsons/dic_war_conditions.json b/shared/resource/jsons/dic_war_conditions.json
index c77e1db5b..f973b8d26 100644
--- a/shared/resource/jsons/dic_war_conditions.json
+++ b/shared/resource/jsons/dic_war_conditions.json
@@ -353,8 +353,8 @@
         "id": 51,
         "warid": 320,
         "c_type": 106,
-        "data": "10&",
-        "describe": "10回合内获得胜利"
+        "data": "15&",
+        "describe": "15回合内获得胜利"
     },
     {
         "id": 52,
@@ -541,9 +541,9 @@
     {
         "id": 78,
         "warid": 508,
-        "c_type": 102,
-        "data": "0&",
-        "describe": "我军全员生存"
+        "c_type": 106,
+        "data": "12&",
+        "describe": "12回合内获得胜利"
     },
     {
         "id": 79,
@@ -1151,8 +1151,8 @@
         "id": 165,
         "warid": 1320,
         "c_type": 106,
-        "data": "15&",
-        "describe": "15回合内获得胜利"
+        "data": "20&",
+        "describe": "20回合内获得胜利"
     },
     {
         "id": 166,
@@ -1655,8 +1655,8 @@
         "id": 237,
         "warid": 3001,
         "c_type": 106,
-        "data": "12&",
-        "describe": "12回合内获得胜利"
+        "data": "15&",
+        "describe": "15回合内获得胜利"
     },
     {
         "id": 238,
@@ -1828,1442 +1828,1442 @@
     },
     {
         "id": 262,
-        "warid": 3100,
+        "warid": 3010,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 263,
-        "warid": 3100,
+        "warid": 3010,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 264,
-        "warid": 3100,
+        "warid": 3010,
         "c_type": 106,
         "data": "12&",
         "describe": "12回合内获得胜利"
     },
     {
         "id": 265,
-        "warid": 3101,
+        "warid": 3100,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 266,
-        "warid": 3101,
+        "warid": 3100,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 267,
-        "warid": 3101,
-        "c_type": 101,
-        "data": "7&",
-        "describe": "击杀达到8人"
+        "warid": 3100,
+        "c_type": 106,
+        "data": "12&",
+        "describe": "12回合内获得胜利"
     },
     {
         "id": 268,
-        "warid": 3102,
+        "warid": 3101,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 269,
-        "warid": 3102,
+        "warid": 3101,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 270,
-        "warid": 3102,
+        "warid": 3101,
         "c_type": 101,
-        "data": "11&",
-        "describe": "击杀达到12人"
+        "data": "7&",
+        "describe": "击杀达到8人"
     },
     {
         "id": 271,
-        "warid": 3103,
+        "warid": 3102,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 272,
-        "warid": 3103,
+        "warid": 3102,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 273,
-        "warid": 3103,
+        "warid": 3102,
         "c_type": 101,
-        "data": "13&",
-        "describe": "击杀达到14人"
+        "data": "11&",
+        "describe": "击杀达到12人"
     },
     {
         "id": 274,
-        "warid": 3104,
+        "warid": 3103,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 275,
-        "warid": 3104,
+        "warid": 3103,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 276,
-        "warid": 3104,
+        "warid": 3103,
         "c_type": 101,
         "data": "13&",
         "describe": "击杀达到14人"
     },
     {
         "id": 277,
-        "warid": 3105,
+        "warid": 3104,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 278,
-        "warid": 3105,
+        "warid": 3104,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 279,
-        "warid": 3105,
+        "warid": 3104,
         "c_type": 101,
         "data": "13&",
         "describe": "击杀达到14人"
     },
     {
         "id": 280,
-        "warid": 3106,
+        "warid": 3105,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 281,
-        "warid": 3106,
+        "warid": 3105,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 282,
-        "warid": 3106,
+        "warid": 3105,
         "c_type": 101,
-        "data": "15&",
-        "describe": "击杀达到16人"
+        "data": "13&",
+        "describe": "击杀达到14人"
     },
     {
         "id": 283,
-        "warid": 3107,
+        "warid": 3106,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 284,
-        "warid": 3107,
+        "warid": 3106,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 285,
-        "warid": 3107,
+        "warid": 3106,
         "c_type": 101,
         "data": "15&",
         "describe": "击杀达到16人"
     },
     {
         "id": 286,
-        "warid": 3108,
+        "warid": 3107,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 287,
-        "warid": 3108,
+        "warid": 3107,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 288,
-        "warid": 3108,
+        "warid": 3107,
         "c_type": 101,
         "data": "15&",
         "describe": "击杀达到16人"
     },
     {
         "id": 289,
-        "warid": 3109,
+        "warid": 3108,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 290,
-        "warid": 3109,
+        "warid": 3108,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 291,
-        "warid": 3109,
+        "warid": 3108,
         "c_type": 101,
         "data": "15&",
         "describe": "击杀达到16人"
     },
     {
         "id": 292,
-        "warid": 3200,
+        "warid": 3109,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 293,
-        "warid": 3200,
+        "warid": 3109,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 294,
-        "warid": 3200,
+        "warid": 3109,
         "c_type": 101,
         "data": "15&",
         "describe": "击杀达到16人"
     },
     {
         "id": 295,
-        "warid": 3201,
+        "warid": 3200,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 296,
-        "warid": 3201,
+        "warid": 3200,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 297,
-        "warid": 3201,
-        "c_type": 106,
-        "data": "10&",
-        "describe": "10回合内获得胜利"
+        "warid": 3200,
+        "c_type": 101,
+        "data": "15&",
+        "describe": "击杀达到16人"
     },
     {
         "id": 298,
-        "warid": 3202,
+        "warid": 3201,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 299,
-        "warid": 3202,
+        "warid": 3201,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 300,
-        "warid": 3202,
+        "warid": 3201,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 301,
-        "warid": 3203,
+        "warid": 3202,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 302,
-        "warid": 3203,
+        "warid": 3202,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 303,
-        "warid": 3203,
+        "warid": 3202,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 304,
-        "warid": 3204,
+        "warid": 3203,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 305,
-        "warid": 3204,
+        "warid": 3203,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 306,
-        "warid": 3204,
+        "warid": 3203,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 307,
-        "warid": 3205,
+        "warid": 3204,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 308,
-        "warid": 3205,
+        "warid": 3204,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 309,
-        "warid": 3205,
+        "warid": 3204,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 310,
-        "warid": 3206,
+        "warid": 3205,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 311,
-        "warid": 3206,
+        "warid": 3205,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 312,
-        "warid": 3206,
+        "warid": 3205,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 313,
-        "warid": 3207,
+        "warid": 3206,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 314,
-        "warid": 3207,
+        "warid": 3206,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 315,
-        "warid": 3207,
+        "warid": 3206,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 316,
-        "warid": 3208,
+        "warid": 3207,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 317,
-        "warid": 3208,
+        "warid": 3207,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 318,
-        "warid": 3208,
+        "warid": 3207,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 319,
-        "warid": 3209,
+        "warid": 3208,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 320,
-        "warid": 3209,
+        "warid": 3208,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 321,
-        "warid": 3209,
+        "warid": 3208,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 322,
-        "warid": 3300,
+        "warid": 3209,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 323,
-        "warid": 3300,
+        "warid": 3209,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 324,
-        "warid": 3300,
+        "warid": 3209,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 325,
-        "warid": 3301,
+        "warid": 3300,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 326,
-        "warid": 3301,
+        "warid": 3300,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 327,
-        "warid": 3301,
+        "warid": 3300,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 328,
-        "warid": 3302,
+        "warid": 3301,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 329,
-        "warid": 3302,
+        "warid": 3301,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 330,
-        "warid": 3302,
+        "warid": 3301,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 331,
-        "warid": 3303,
+        "warid": 3302,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 332,
-        "warid": 3303,
+        "warid": 3302,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 333,
-        "warid": 3303,
+        "warid": 3302,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 334,
-        "warid": 3304,
+        "warid": 3303,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 335,
-        "warid": 3304,
+        "warid": 3303,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 336,
-        "warid": 3304,
+        "warid": 3303,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 337,
-        "warid": 3305,
+        "warid": 3304,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 338,
-        "warid": 3305,
+        "warid": 3304,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 339,
-        "warid": 3305,
+        "warid": 3304,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 340,
-        "warid": 3306,
+        "warid": 3305,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 341,
-        "warid": 3306,
+        "warid": 3305,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 342,
-        "warid": 3306,
+        "warid": 3305,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 343,
-        "warid": 3307,
+        "warid": 3306,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 344,
-        "warid": 3307,
+        "warid": 3306,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 345,
-        "warid": 3307,
+        "warid": 3306,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 346,
-        "warid": 3308,
+        "warid": 3307,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 347,
-        "warid": 3308,
+        "warid": 3307,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 348,
-        "warid": 3308,
+        "warid": 3307,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 349,
-        "warid": 3309,
+        "warid": 3308,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 350,
-        "warid": 3309,
+        "warid": 3308,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 351,
-        "warid": 3309,
+        "warid": 3308,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 352,
-        "warid": 5001,
+        "warid": 3309,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 353,
-        "warid": 5001,
+        "warid": 3309,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 354,
-        "warid": 5001,
+        "warid": 3309,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 355,
-        "warid": 5002,
+        "warid": 5001,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 356,
-        "warid": 5002,
+        "warid": 5001,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 357,
-        "warid": 5002,
+        "warid": 5001,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 358,
-        "warid": 5003,
+        "warid": 5002,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 359,
-        "warid": 5003,
+        "warid": 5002,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 360,
-        "warid": 5003,
+        "warid": 5002,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 361,
-        "warid": 5004,
+        "warid": 5003,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 362,
-        "warid": 5004,
+        "warid": 5003,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 363,
-        "warid": 5004,
+        "warid": 5003,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 364,
-        "warid": 5005,
+        "warid": 5004,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 365,
-        "warid": 5005,
+        "warid": 5004,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 366,
-        "warid": 5005,
+        "warid": 5004,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 367,
-        "warid": 5010,
+        "warid": 5005,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 368,
-        "warid": 5010,
+        "warid": 5005,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 369,
-        "warid": 5010,
+        "warid": 5005,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 370,
-        "warid": 5011,
+        "warid": 5010,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 371,
-        "warid": 5011,
+        "warid": 5010,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 372,
-        "warid": 5011,
+        "warid": 5010,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 373,
-        "warid": 5012,
+        "warid": 5011,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 374,
-        "warid": 5012,
+        "warid": 5011,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 375,
-        "warid": 5012,
+        "warid": 5011,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 376,
-        "warid": 5013,
+        "warid": 5012,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 377,
-        "warid": 5013,
+        "warid": 5012,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 378,
-        "warid": 5013,
+        "warid": 5012,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 379,
-        "warid": 5014,
+        "warid": 5013,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 380,
-        "warid": 5014,
+        "warid": 5013,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 381,
-        "warid": 5014,
+        "warid": 5013,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 382,
-        "warid": 5020,
+        "warid": 5014,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 383,
-        "warid": 5020,
+        "warid": 5014,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 384,
-        "warid": 5020,
+        "warid": 5014,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 385,
-        "warid": 5021,
+        "warid": 5020,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 386,
-        "warid": 5021,
+        "warid": 5020,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 387,
-        "warid": 5021,
+        "warid": 5020,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 388,
-        "warid": 5022,
+        "warid": 5021,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 389,
-        "warid": 5022,
+        "warid": 5021,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 390,
-        "warid": 5022,
+        "warid": 5021,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 391,
-        "warid": 5023,
+        "warid": 5022,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 392,
-        "warid": 5023,
+        "warid": 5022,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 393,
-        "warid": 5023,
+        "warid": 5022,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 394,
-        "warid": 5024,
+        "warid": 5023,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 395,
-        "warid": 5024,
+        "warid": 5023,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 396,
-        "warid": 5024,
+        "warid": 5023,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 397,
-        "warid": 5030,
+        "warid": 5024,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 398,
-        "warid": 5030,
+        "warid": 5024,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 399,
-        "warid": 5030,
+        "warid": 5024,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 400,
-        "warid": 5031,
+        "warid": 5030,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 401,
-        "warid": 5031,
+        "warid": 5030,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 402,
-        "warid": 5031,
+        "warid": 5030,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 403,
-        "warid": 5032,
+        "warid": 5031,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 404,
-        "warid": 5032,
+        "warid": 5031,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 405,
-        "warid": 5032,
+        "warid": 5031,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 406,
-        "warid": 5033,
+        "warid": 5032,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 407,
-        "warid": 5033,
+        "warid": 5032,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 408,
-        "warid": 5033,
+        "warid": 5032,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 409,
-        "warid": 5034,
+        "warid": 5033,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 410,
-        "warid": 5034,
+        "warid": 5033,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 411,
-        "warid": 5034,
+        "warid": 5033,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 412,
-        "warid": 5040,
+        "warid": 5034,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 413,
-        "warid": 5040,
+        "warid": 5034,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 414,
-        "warid": 5040,
+        "warid": 5034,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 415,
-        "warid": 5041,
+        "warid": 5040,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 416,
-        "warid": 5041,
+        "warid": 5040,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 417,
-        "warid": 5041,
+        "warid": 5040,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 418,
-        "warid": 5042,
+        "warid": 5041,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 419,
-        "warid": 5042,
+        "warid": 5041,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 420,
-        "warid": 5042,
+        "warid": 5041,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 421,
-        "warid": 5043,
+        "warid": 5042,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 422,
-        "warid": 5043,
+        "warid": 5042,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 423,
-        "warid": 5043,
+        "warid": 5042,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 424,
-        "warid": 5044,
+        "warid": 5043,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 425,
-        "warid": 5044,
+        "warid": 5043,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 426,
-        "warid": 5044,
+        "warid": 5043,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 427,
-        "warid": 5050,
+        "warid": 5044,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 428,
-        "warid": 5050,
+        "warid": 5044,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 429,
-        "warid": 5050,
+        "warid": 5044,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 430,
-        "warid": 5051,
+        "warid": 5050,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 431,
-        "warid": 5051,
+        "warid": 5050,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 432,
-        "warid": 5051,
+        "warid": 5050,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 433,
-        "warid": 5052,
+        "warid": 5051,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 434,
-        "warid": 5052,
+        "warid": 5051,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 435,
-        "warid": 5052,
+        "warid": 5051,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 436,
-        "warid": 5053,
+        "warid": 5052,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 437,
-        "warid": 5053,
+        "warid": 5052,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 438,
-        "warid": 5053,
+        "warid": 5052,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 439,
-        "warid": 5054,
+        "warid": 5053,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 440,
-        "warid": 5054,
+        "warid": 5053,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 441,
-        "warid": 5054,
+        "warid": 5053,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 442,
-        "warid": 5060,
+        "warid": 5054,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 443,
-        "warid": 5060,
+        "warid": 5054,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 444,
-        "warid": 5060,
+        "warid": 5054,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 445,
-        "warid": 5061,
+        "warid": 5060,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 446,
-        "warid": 5061,
+        "warid": 5060,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 447,
-        "warid": 5061,
+        "warid": 5060,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 448,
-        "warid": 5062,
+        "warid": 5061,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 449,
-        "warid": 5062,
+        "warid": 5061,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 450,
-        "warid": 5062,
+        "warid": 5061,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 451,
-        "warid": 5063,
+        "warid": 5062,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 452,
-        "warid": 5063,
+        "warid": 5062,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 453,
-        "warid": 5063,
+        "warid": 5062,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 454,
-        "warid": 5064,
+        "warid": 5063,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 455,
-        "warid": 5064,
+        "warid": 5063,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 456,
-        "warid": 5064,
+        "warid": 5063,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 457,
-        "warid": 1000107,
+        "warid": 5064,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 458,
-        "warid": 1000107,
-        "c_type": 302,
-        "data": "99&",
-        "describe": "取得胜利"
+        "warid": 5064,
+        "c_type": 102,
+        "data": "0&",
+        "describe": "我军全员生存"
     },
     {
         "id": 459,
-        "warid": 1000107,
-        "c_type": 302,
-        "data": "99&",
-        "describe": "取得胜利"
+        "warid": 5064,
+        "c_type": 106,
+        "data": "10&",
+        "describe": "10回合内获得胜利"
     },
     {
         "id": 460,
-        "warid": 1000112,
+        "warid": 1000107,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 461,
-        "warid": 1000112,
+        "warid": 1000107,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 462,
-        "warid": 1000112,
+        "warid": 1000107,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 463,
-        "warid": 1000116,
+        "warid": 1000112,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 464,
-        "warid": 1000116,
+        "warid": 1000112,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 465,
-        "warid": 1000116,
+        "warid": 1000112,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 466,
-        "warid": 1000114,
+        "warid": 1000116,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 467,
-        "warid": 1000115,
+        "warid": 1000116,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
@@ -3277,21 +3277,21 @@
     },
     {
         "id": 469,
-        "warid": 1000120,
+        "warid": 1000114,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 470,
-        "warid": 1000120,
+        "warid": 1000115,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 471,
-        "warid": 1000120,
+        "warid": 1000116,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
@@ -3305,21 +3305,21 @@
     },
     {
         "id": 473,
-        "warid": 1000124,
+        "warid": 1000120,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 474,
-        "warid": 1000124,
+        "warid": 1000120,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 475,
-        "warid": 1000124,
+        "warid": 1000120,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
@@ -3333,21 +3333,21 @@
     },
     {
         "id": 477,
-        "warid": 1000128,
+        "warid": 1000124,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 478,
-        "warid": 1000128,
+        "warid": 1000124,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 479,
-        "warid": 1000128,
+        "warid": 1000124,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
@@ -3361,342 +3361,363 @@
     },
     {
         "id": 481,
-        "warid": 1100128,
-        "c_type": 108,
-        "data": "1&",
-        "describe": "友军死亡不超过1"
+        "warid": 1000128,
+        "c_type": 302,
+        "data": "99&",
+        "describe": "取得胜利"
     },
     {
         "id": 482,
-        "warid": 1100128,
+        "warid": 1000128,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 483,
-        "warid": 1100128,
-        "c_type": 102,
-        "data": "0&",
-        "describe": "我军全员生存"
+        "warid": 1000128,
+        "c_type": 302,
+        "data": "99&",
+        "describe": "取得胜利"
     },
     {
         "id": 484,
         "warid": 1100128,
-        "c_type": 106,
-        "data": "10&",
-        "describe": "10回合内获得胜利"
+        "c_type": 108,
+        "data": "1&",
+        "describe": "友军死亡不超过1"
     },
     {
         "id": 485,
-        "warid": 1100129,
+        "warid": 1100128,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 486,
-        "warid": 1100129,
+        "warid": 1100128,
         "c_type": 102,
         "data": "0&",
         "describe": "我军全员生存"
     },
     {
         "id": 487,
-        "warid": 1100129,
+        "warid": 1100128,
         "c_type": 106,
         "data": "10&",
         "describe": "10回合内获得胜利"
     },
     {
         "id": 488,
-        "warid": 704,
+        "warid": 1100129,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 489,
-        "warid": 704,
+        "warid": 1100129,
         "c_type": 102,
-        "data": "2&",
-        "describe": "阵亡人数不超过2人"
+        "data": "0&",
+        "describe": "我军全员生存"
     },
     {
         "id": 490,
-        "warid": 704,
-        "c_type": 115,
-        "data": "1&3&1",
-        "describe": "阻止任意敌人登船"
+        "warid": 1100129,
+        "c_type": 106,
+        "data": "10&",
+        "describe": "10回合内获得胜利"
     },
     {
         "id": 491,
-        "warid": 708,
+        "warid": 704,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 492,
-        "warid": 708,
+        "warid": 704,
         "c_type": 102,
         "data": "2&",
         "describe": "阵亡人数不超过2人"
     },
     {
         "id": 493,
-        "warid": 708,
+        "warid": 704,
         "c_type": 115,
-        "data": "2&2&0",
-        "describe": "阻止任意曹军撤退"
+        "data": "1&3&1",
+        "describe": "阻止任意敌人登船"
     },
     {
         "id": 494,
-        "warid": 712,
+        "warid": 708,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 495,
-        "warid": 712,
+        "warid": 708,
         "c_type": 102,
         "data": "2&",
         "describe": "阵亡人数不超过2人"
     },
     {
         "id": 496,
-        "warid": 712,
-        "c_type": 106,
-        "data": "12&",
-        "describe": "12回合内获得胜利"
+        "warid": 708,
+        "c_type": 115,
+        "data": "2&2&0",
+        "describe": "阻止任意曹军撤退"
     },
     {
         "id": 497,
-        "warid": 716,
+        "warid": 712,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 498,
-        "warid": 716,
+        "warid": 712,
         "c_type": 102,
         "data": "2&",
         "describe": "阵亡人数不超过2人"
     },
     {
         "id": 499,
-        "warid": 716,
+        "warid": 712,
         "c_type": 106,
-        "data": "10&",
-        "describe": "10回合内获得胜利"
+        "data": "12&",
+        "describe": "12回合内获得胜利"
     },
     {
         "id": 500,
-        "warid": 720,
+        "warid": 716,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 501,
-        "warid": 720,
+        "warid": 716,
         "c_type": 102,
         "data": "2&",
         "describe": "阵亡人数不超过2人"
     },
     {
         "id": 502,
-        "warid": 720,
-        "c_type": 102,
-        "data": "0&",
-        "describe": "我军全员存活"
+        "warid": 716,
+        "c_type": 106,
+        "data": "10&",
+        "describe": "10回合内获得胜利"
     },
     {
         "id": 503,
-        "warid": 724,
+        "warid": 720,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 504,
-        "warid": 724,
+        "warid": 720,
         "c_type": 102,
         "data": "2&",
         "describe": "阵亡人数不超过2人"
     },
     {
         "id": 505,
-        "warid": 724,
-        "c_type": 106,
-        "data": "18&",
-        "describe": "18回合内获得胜利"
+        "warid": 720,
+        "c_type": 102,
+        "data": "0&",
+        "describe": "我军全员存活"
     },
     {
         "id": 506,
-        "warid": 728,
+        "warid": 724,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 507,
-        "warid": 728,
+        "warid": 724,
         "c_type": 102,
         "data": "2&",
         "describe": "阵亡人数不超过2人"
     },
     {
         "id": 508,
-        "warid": 728,
+        "warid": 724,
         "c_type": 106,
         "data": "18&",
         "describe": "18回合内获得胜利"
     },
     {
         "id": 509,
-        "warid": 1704,
+        "warid": 728,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 510,
-        "warid": 1704,
+        "warid": 728,
         "c_type": 102,
         "data": "2&",
         "describe": "阵亡人数不超过2人"
     },
     {
         "id": 511,
-        "warid": 1704,
-        "c_type": 115,
-        "data": "1&3&1",
-        "describe": "阻止任意敌人登船"
+        "warid": 728,
+        "c_type": 106,
+        "data": "18&",
+        "describe": "18回合内获得胜利"
     },
     {
         "id": 512,
-        "warid": 1708,
+        "warid": 1704,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 513,
-        "warid": 1708,
+        "warid": 1704,
         "c_type": 102,
         "data": "2&",
         "describe": "阵亡人数不超过2人"
     },
     {
         "id": 514,
-        "warid": 1708,
+        "warid": 1704,
         "c_type": 115,
-        "data": "2&2&0",
-        "describe": "阻止任意曹军撤退"
+        "data": "1&3&1",
+        "describe": "阻止任意敌人登船"
     },
     {
         "id": 515,
-        "warid": 1712,
+        "warid": 1708,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 516,
-        "warid": 1712,
+        "warid": 1708,
         "c_type": 102,
         "data": "2&",
         "describe": "阵亡人数不超过2人"
     },
     {
         "id": 517,
-        "warid": 1712,
-        "c_type": 106,
-        "data": "12&",
-        "describe": "12回合内获得胜利"
+        "warid": 1708,
+        "c_type": 115,
+        "data": "2&2&0",
+        "describe": "阻止任意曹军撤退"
     },
     {
         "id": 518,
-        "warid": 1716,
+        "warid": 1712,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 519,
-        "warid": 1716,
+        "warid": 1712,
         "c_type": 102,
         "data": "2&",
         "describe": "阵亡人数不超过2人"
     },
     {
         "id": 520,
-        "warid": 1716,
+        "warid": 1712,
         "c_type": 106,
-        "data": "10&",
-        "describe": "10回合内获得胜利"
+        "data": "12&",
+        "describe": "12回合内获得胜利"
     },
     {
         "id": 521,
-        "warid": 1720,
+        "warid": 1716,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 522,
-        "warid": 1720,
+        "warid": 1716,
         "c_type": 102,
         "data": "2&",
         "describe": "阵亡人数不超过2人"
     },
     {
         "id": 523,
-        "warid": 1720,
-        "c_type": 102,
-        "data": "0&",
-        "describe": "我军全员存活"
+        "warid": 1716,
+        "c_type": 106,
+        "data": "10&",
+        "describe": "10回合内获得胜利"
     },
     {
         "id": 524,
-        "warid": 1724,
+        "warid": 1720,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 525,
-        "warid": 1724,
+        "warid": 1720,
         "c_type": 102,
         "data": "2&",
         "describe": "阵亡人数不超过2人"
     },
     {
         "id": 526,
-        "warid": 1724,
-        "c_type": 106,
-        "data": "18&",
-        "describe": "18回合内获得胜利"
+        "warid": 1720,
+        "c_type": 102,
+        "data": "0&",
+        "describe": "我军全员存活"
     },
     {
         "id": 527,
-        "warid": 1728,
+        "warid": 1724,
         "c_type": 302,
         "data": "99&",
         "describe": "取得胜利"
     },
     {
         "id": 528,
-        "warid": 1728,
+        "warid": 1724,
         "c_type": 102,
         "data": "2&",
         "describe": "阵亡人数不超过2人"
     },
     {
         "id": 529,
+        "warid": 1724,
+        "c_type": 106,
+        "data": "18&",
+        "describe": "18回合内获得胜利"
+    },
+    {
+        "id": 530,
+        "warid": 1728,
+        "c_type": 302,
+        "data": "99&",
+        "describe": "取得胜利"
+    },
+    {
+        "id": 531,
+        "warid": 1728,
+        "c_type": 102,
+        "data": "2&",
+        "describe": "阵亡人数不超过2人"
+    },
+    {
+        "id": 532,
         "warid": 1728,
         "c_type": 106,
         "data": "18&",