diff --git a/shared/resource/jsons/dic_zyz_daily.json b/shared/resource/jsons/dic_zyz_daily.json
index a01d739f4..eae489168 100644
--- a/shared/resource/jsons/dic_zyz_daily.json
+++ b/shared/resource/jsons/dic_zyz_daily.json
@@ -9,26 +9,26 @@
     },
     {
         "dailyType": 2,
-        "name": "城池守卫",
+        "name": "城池防守战",
         "timesPerDay": 200,
         "timesCanBuy": 200,
-        "difficultLvl": "3010&3011&3012&3013&3014",
-        "description": "暂未开放，内有不同难度，可获得大量武将经验书"
+        "difficultLvl": "3100&3101&3102&3103&3104",
+        "description": "防守城池，不让敌军进入，可获得大量武将经验书"
     },
     {
         "dailyType": 3,
-        "name": "保护矿产",
+        "name": "矿石争夺战",
         "timesPerDay": 200,
         "timesCanBuy": 200,
-        "difficultLvl": "3020&3021&3022&3023&3024",
-        "description": "暂未开放，内有不同难度，可获得大量装备强化材料"
+        "difficultLvl": "3200&3201&3202&3203&3204",
+        "description": "保护矿产不让敌军带走，可获得大量装备精练材料"
     },
     {
         "dailyType": 4,
-        "name": "测试测试",
+        "name": "矿场保卫战",
         "timesPerDay": 200,
         "timesCanBuy": 200,
-        "difficultLvl": "3031&3032&3033&3034",
-        "description": "暂未开放，内有不同难度，可获得大量装备精练材料"
+        "difficultLvl": "3300&3301&3302&3303&3304",
+        "description": "与敌人争夺矿场的所有权，可获得大量装备强化材料"
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/jsons/dic_zyz_gk_daily.json b/shared/resource/jsons/dic_zyz_gk_daily.json
old mode 100755
new mode 100644
index a0b2a01b3..eeb3d81e0
--- a/shared/resource/jsons/dic_zyz_gk_daily.json
+++ b/shared/resource/jsons/dic_zyz_gk_daily.json
@@ -187,7 +187,7 @@
         "war_id": 3009,
         "dispatchJsonId": 3009,
         "bg_img_id": 501,
-        "script_id": 0,
+        "script_id": "S_3001",
         "fixReward": "31001&1|31002&10|17006&2|17006&3",
         "warType": 4,
         "gk_name": "每日&护送商人",
@@ -207,13 +207,13 @@
         "dailyType": 1
     },
     {
-        "war_id": 3010,
-        "dispatchJsonId": 3010,
-        "bg_img_id": 501,
-        "script_id": 0,
+        "war_id": 3100,
+        "dispatchJsonId": 3100,
+        "bg_img_id": 502,
+        "script_id": "S_3100",
         "fixReward": "6005&1|6004&10|11001&2|11002&3",
         "warType": 4,
-        "gk_name": "每日&城池守卫",
+        "gk_name": "每日&城池防守战",
         "kingExp": 100,
         "lvLimted": 30,
         "turnLimted": 20,
@@ -230,13 +230,13 @@
         "dailyType": 2
     },
     {
-        "war_id": 3011,
-        "dispatchJsonId": 3011,
-        "bg_img_id": 501,
-        "script_id": 0,
+        "war_id": 3101,
+        "dispatchJsonId": 3101,
+        "bg_img_id": 502,
+        "script_id": "S_3100",
         "fixReward": "11003&1|1&10|2&2|3&3",
         "warType": 4,
-        "gk_name": "每日&城池守卫",
+        "gk_name": "每日&城池防守战",
         "kingExp": 100,
         "lvLimted": 30,
         "turnLimted": 20,
@@ -253,13 +253,13 @@
         "dailyType": 2
     },
     {
-        "war_id": 3012,
-        "dispatchJsonId": 3012,
-        "bg_img_id": 501,
-        "script_id": 0,
+        "war_id": 3102,
+        "dispatchJsonId": 3102,
+        "bg_img_id": 502,
+        "script_id": "S_3100",
         "fixReward": "17004&1|17005&10|17001&2|17002&3",
         "warType": 4,
-        "gk_name": "每日&城池守卫",
+        "gk_name": "每日&城池防守战",
         "kingExp": 100,
         "lvLimted": 30,
         "turnLimted": 20,
@@ -276,13 +276,13 @@
         "dailyType": 2
     },
     {
-        "war_id": 3013,
-        "dispatchJsonId": 3013,
-        "bg_img_id": 501,
-        "script_id": 0,
+        "war_id": 3103,
+        "dispatchJsonId": 3103,
+        "bg_img_id": 502,
+        "script_id": "S_3100",
         "fixReward": "31001&1|31002&10|17006&2|17006&3",
         "warType": 4,
-        "gk_name": "每日&城池守卫",
+        "gk_name": "每日&城池防守战",
         "kingExp": 100,
         "lvLimted": 30,
         "turnLimted": 20,
@@ -299,13 +299,13 @@
         "dailyType": 2
     },
     {
-        "war_id": 3014,
-        "dispatchJsonId": 3014,
-        "bg_img_id": 501,
-        "script_id": 0,
+        "war_id": 3104,
+        "dispatchJsonId": 3104,
+        "bg_img_id": 502,
+        "script_id": "S_3100",
         "fixReward": "31003&1|31004&30|31002&20|31002&20",
         "warType": 4,
-        "gk_name": "每日&城池守卫",
+        "gk_name": "每日&城池防守战",
         "kingExp": 100,
         "lvLimted": 30,
         "turnLimted": 20,
@@ -322,13 +322,13 @@
         "dailyType": 2
     },
     {
-        "war_id": 3020,
-        "dispatchJsonId": 3020,
-        "bg_img_id": 501,
-        "script_id": 0,
+        "war_id": 3200,
+        "dispatchJsonId": 3200,
+        "bg_img_id": 503,
+        "script_id": "S_3200",
         "fixReward": "17041&1|17001&10|17005&2|17006&3",
         "warType": 4,
-        "gk_name": "每日&保护矿产",
+        "gk_name": "每日&矿石争夺战",
         "kingExp": 100,
         "lvLimted": 50,
         "turnLimted": 20,
@@ -345,13 +345,13 @@
         "dailyType": 3
     },
     {
-        "war_id": 3021,
-        "dispatchJsonId": 3021,
-        "bg_img_id": 501,
-        "script_id": 0,
+        "war_id": 3201,
+        "dispatchJsonId": 3201,
+        "bg_img_id": 503,
+        "script_id": "S_3200",
         "fixReward": "17040&1|17002&10|17007&2|17008&3",
         "warType": 4,
-        "gk_name": "每日&保护矿产",
+        "gk_name": "每日&矿石争夺战",
         "kingExp": 100,
         "lvLimted": 50,
         "turnLimted": 20,
@@ -368,13 +368,13 @@
         "dailyType": 3
     },
     {
-        "war_id": 3022,
-        "dispatchJsonId": 3022,
-        "bg_img_id": 501,
-        "script_id": 0,
+        "war_id": 3202,
+        "dispatchJsonId": 3202,
+        "bg_img_id": 503,
+        "script_id": "S_3200",
         "fixReward": "17039&1|17038&10|17037&2|17036&3",
         "warType": 4,
-        "gk_name": "每日&保护矿产",
+        "gk_name": "每日&矿石争夺战",
         "kingExp": 100,
         "lvLimted": 50,
         "turnLimted": 20,
@@ -391,13 +391,13 @@
         "dailyType": 3
     },
     {
-        "war_id": 3023,
-        "dispatchJsonId": 3023,
-        "bg_img_id": 501,
-        "script_id": 0,
+        "war_id": 3203,
+        "dispatchJsonId": 3203,
+        "bg_img_id": 503,
+        "script_id": "S_3200",
         "fixReward": "31001&1|31002&10|17006&2|17006&3",
         "warType": 4,
-        "gk_name": "每日&保护矿产",
+        "gk_name": "每日&矿石争夺战",
         "kingExp": 100,
         "lvLimted": 50,
         "turnLimted": 20,
@@ -414,13 +414,13 @@
         "dailyType": 3
     },
     {
-        "war_id": 3024,
-        "dispatchJsonId": 3024,
-        "bg_img_id": 501,
-        "script_id": 0,
+        "war_id": 3204,
+        "dispatchJsonId": 3204,
+        "bg_img_id": 503,
+        "script_id": "S_3200",
         "fixReward": "31003&1|31001&30|31002&20|31002&20",
         "warType": 4,
-        "gk_name": "每日&保护矿产",
+        "gk_name": "每日&矿石争夺战",
         "kingExp": 100,
         "lvLimted": 50,
         "turnLimted": 20,
@@ -437,13 +437,13 @@
         "dailyType": 3
     },
     {
-        "war_id": 3031,
-        "dispatchJsonId": 3021,
-        "bg_img_id": 501,
+        "war_id": 3300,
+        "dispatchJsonId": 3300,
+        "bg_img_id": 504,
         "script_id": 0,
         "fixReward": "17002&1|17001&10|17005&2|17006&3",
         "warType": 4,
-        "gk_name": "每日&争夺矿点",
+        "gk_name": "每日&矿场保卫战",
         "kingExp": 100,
         "lvLimted": 70,
         "turnLimted": 20,
@@ -454,19 +454,19 @@
         "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
         "cost": 0,
         "iconInMap": "dengji2",
-        "iconName": "普通",
+        "iconName": "新手",
         "recommendedPower": 10008,
         "previousGk": 0,
         "dailyType": 4
     },
     {
-        "war_id": 3032,
-        "dispatchJsonId": 3022,
-        "bg_img_id": 501,
+        "war_id": 3301,
+        "dispatchJsonId": 3301,
+        "bg_img_id": 504,
         "script_id": 0,
         "fixReward": "17003&1|17002&10|17007&2|17008&3",
         "warType": 4,
-        "gk_name": "每日&争夺矿点",
+        "gk_name": "每日&矿场保卫战",
         "kingExp": 100,
         "lvLimted": 70,
         "turnLimted": 20,
@@ -477,19 +477,19 @@
         "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
         "cost": 0,
         "iconInMap": "dengji3",
-        "iconName": "困难",
+        "iconName": "普通",
         "recommendedPower": 10008,
         "previousGk": 3031,
         "dailyType": 4
     },
     {
-        "war_id": 3033,
-        "dispatchJsonId": 3023,
-        "bg_img_id": 501,
+        "war_id": 3302,
+        "dispatchJsonId": 3302,
+        "bg_img_id": 504,
         "script_id": 0,
         "fixReward": "17002&1|17038&10|17001&2|17034&3",
         "warType": 4,
-        "gk_name": "每日&争夺矿点",
+        "gk_name": "每日&矿场保卫战",
         "kingExp": 100,
         "lvLimted": 70,
         "turnLimted": 20,
@@ -500,19 +500,42 @@
         "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
         "cost": 0,
         "iconInMap": "dengji4",
-        "iconName": "恶梦",
+        "iconName": "困难",
         "recommendedPower": 10008,
         "previousGk": 3032,
         "dailyType": 4
     },
     {
-        "war_id": 3034,
-        "dispatchJsonId": 3024,
-        "bg_img_id": 501,
+        "war_id": 3303,
+        "dispatchJsonId": 3303,
+        "bg_img_id": 504,
         "script_id": 0,
         "fixReward": "31001&1|31002&10|17006&2|17006&3",
         "warType": 4,
-        "gk_name": "每日&争夺矿点",
+        "gk_name": "每日&矿场保卫战",
+        "kingExp": 100,
+        "lvLimted": 70,
+        "turnLimted": 20,
+        "forcedCharactor": "&",
+        "fobiddenCharactor": "&",
+        "victoryInfoInUI": "消灭所有敌军",
+        "loseInfoInUI": "\r\n我方全部阵亡",
+        "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
+        "cost": 0,
+        "iconInMap": "dengji5",
+        "iconName": "恶梦",
+        "recommendedPower": 10008,
+        "previousGk": 3033,
+        "dailyType": 4
+    },
+    {
+        "war_id": 3304,
+        "dispatchJsonId": 3304,
+        "bg_img_id": 504,
+        "script_id": 0,
+        "fixReward": "31001&1|31002&10|17006&2|17006&3",
+        "warType": 4,
+        "gk_name": "每日&矿场保卫战",
         "kingExp": 100,
         "lvLimted": 70,
         "turnLimted": 20,