From 525bb0aea5a2ad7180989af9389f07e69463d7af Mon Sep 17 00:00:00 2001
From: yajun <luyajun@trgame.cn>
Date: Tue, 17 May 2022 11:05:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/resource/jsons/dic_zyz_gk_main.json  | 20 ++++++++++----------
 shared/resource/jsons/dic_zyz_shopList.json |  4 ++++
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/shared/resource/jsons/dic_zyz_gk_main.json b/shared/resource/jsons/dic_zyz_gk_main.json
index 6ea574843..edac3d783 100644
--- a/shared/resource/jsons/dic_zyz_gk_main.json
+++ b/shared/resource/jsons/dic_zyz_gk_main.json
@@ -221,7 +221,7 @@
         "conditionReward": "31002&50&0|31002&100&1",
         "RandomReward": "&",
         "warType": 1,
-        "gk_name": "第一章&1-1真定之战",
+        "gk_name": "第一章&真定之战",
         "kingExp": 15,
         "lvLimted": 3,
         "turnLimted": 30,
@@ -652,7 +652,7 @@
         "cost": 30,
         "iconInMap": "city&3",
         "iconName": "渤 海",
-        "heroInUI": "1&1003|1&1011|1&1052",
+        "heroInUI": "1&1011|1&1011|1&1052",
         "detailUIBg": "1_4",
         "recommendedPower": 107573,
         "previousGk": 119,
@@ -3327,16 +3327,16 @@
     {
         "war_id": 421,
         "dispatchJsonId": 421,
-        "bg_img": 421,
-        "mapid": 421,
+        "bg_img": 422,
+        "mapid": 422,
         "chapter": 4,
         "section": 21,
-        "script_id": "&",
+        "script_id": "RE_421",
         "fixReward": "11001&8|31001&600|17024&1",
         "conditionReward": "&",
         "RandomReward": "&",
         "warType": 1,
-        "gk_name": "第四章&刘虞残军",
+        "gk_name": "第四章&狂热残敌",
         "kingExp": 5,
         "lvLimted": 1,
         "turnLimted": 20,
@@ -3362,16 +3362,16 @@
     {
         "war_id": 422,
         "dispatchJsonId": 422,
-        "bg_img": 422,
-        "mapid": 422,
+        "bg_img": 421,
+        "mapid": 421,
         "chapter": 4,
         "section": 22,
-        "script_id": "&",
+        "script_id": "R_422&S_422&RE_422",
         "fixReward": "11001&8|31001&600|17025&1",
         "conditionReward": "&",
         "RandomReward": "&",
         "warType": 1,
-        "gk_name": "第四章&狂热残敌",
+        "gk_name": "第四章&二人之敌",
         "kingExp": 5,
         "lvLimted": 1,
         "turnLimted": 20,
diff --git a/shared/resource/jsons/dic_zyz_shopList.json b/shared/resource/jsons/dic_zyz_shopList.json
index f6d42ecc2..339497995 100644
--- a/shared/resource/jsons/dic_zyz_shopList.json
+++ b/shared/resource/jsons/dic_zyz_shopList.json
@@ -37,7 +37,11 @@
         "shopicon": "shoptubiaozi_shizhuang",
         "typeid": "7&12",
         "moneyid": "40006&40014",
+<<<<<<< Updated upstream
         "openLimit": "20&"
+=======
+        "openLimit": "5&"
+>>>>>>> Stashed changes
     },
     {
         "shopid": 6,