Merge branch 'master' of https://gitlab.trgame.cn/zyztech/zyz_server

shared/resource/jsons/dic_zyz_gk_main.json

@@ -1486,9 +1486,9 @@
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
-        "victoryInfoInUI": "消灭所有敌军",
-        "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
+        "victoryInfoInUI": "消灭所有敌军\r\n占领所有兵营",
+        "loseInfoInUI": "我方全部阵亡\r\n丢失所有兵营",
+        "starInfoInUI": "1.我方无人阵亡；\r\n2.在12回合内获得胜利",
         "cost": 10,
         "iconInMap": "city&2",
         "iconName": "郿坞",
@@ -2341,8 +2341,8 @@
         "needPrepare": 1,
         "levelString": "三章16关",
         "HeroNum": "1&6",
-        "progress": "&",
-        "progressDesc": "&"
+        "progress": "2&0|1&0",
+        "progressDesc": "到达码头百姓数&被拦截的百姓数"
     },
     {
         "war_id": 317,
@@ -2621,8 +2621,8 @@
         "needPrepare": 1,
         "levelString": "三章24关",
         "HeroNum": "1&6",
-        "progress": "&",
-        "progressDesc": "&"
+        "progress": "1&0|2&0|3&0|4&0|5&0|11&0",
+        "progressDesc": "(20,14)开关&(12,14)开关&(10,7)开关&(9,2)开关&(20,2)开关&烽火台点燃数量"
     },
     {
         "war_id": 401,