diff --git a/shared/resource/jsons/dic_zyz_gk_daily.json b/shared/resource/jsons/dic_zyz_gk_daily.json
index 3c8f39a30..ad47df487 100644
--- a/shared/resource/jsons/dic_zyz_gk_daily.json
+++ b/shared/resource/jsons/dic_zyz_gk_daily.json
@@ -5,6 +5,7 @@
         "bg_img_id": 501,
         "script_id": "S_3001",
         "fixReward": "17054&90",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&护送商人",
         "kingExp": 0,
@@ -29,6 +30,7 @@
         "bg_img_id": 501,
         "script_id": "S_3001",
         "fixReward": "17054&100",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&护送商人",
         "kingExp": 0,
@@ -53,6 +55,7 @@
         "bg_img_id": 501,
         "script_id": "S_3001",
         "fixReward": "17054&110",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&护送商人",
         "kingExp": 0,
@@ -77,6 +80,7 @@
         "bg_img_id": 501,
         "script_id": "S_3001",
         "fixReward": "17054&120",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&护送商人",
         "kingExp": 0,
@@ -101,6 +105,7 @@
         "bg_img_id": 501,
         "script_id": "S_3001",
         "fixReward": "17054&130",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&护送商人",
         "kingExp": 0,
@@ -125,6 +130,7 @@
         "bg_img_id": 501,
         "script_id": "S_3001",
         "fixReward": "17054&140",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&护送商人",
         "kingExp": 0,
@@ -149,6 +155,7 @@
         "bg_img_id": 501,
         "script_id": "S_3001",
         "fixReward": "17054&150",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&护送商人",
         "kingExp": 0,
@@ -173,6 +180,7 @@
         "bg_img_id": 501,
         "script_id": "S_3001",
         "fixReward": "17054&160",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&护送商人",
         "kingExp": 0,
@@ -197,6 +205,7 @@
         "bg_img_id": 501,
         "script_id": "S_3001",
         "fixReward": "17054&170",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&护送商人",
         "kingExp": 0,
@@ -221,6 +230,7 @@
         "bg_img_id": 501,
         "script_id": "S_3001",
         "fixReward": "17054&180",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&护送商人",
         "kingExp": 0,
@@ -245,6 +255,7 @@
         "bg_img_id": 502,
         "script_id": "S_3100",
         "fixReward": "60001&32",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&城池防守战",
         "kingExp": 0,
@@ -269,6 +280,7 @@
         "bg_img_id": 502,
         "script_id": "S_3100",
         "fixReward": "60001&44",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&城池防守战",
         "kingExp": 0,
@@ -293,6 +305,7 @@
         "bg_img_id": 502,
         "script_id": "S_3100",
         "fixReward": "60001&56",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&城池防守战",
         "kingExp": 0,
@@ -317,6 +330,7 @@
         "bg_img_id": 502,
         "script_id": "S_3100",
         "fixReward": "60001&68",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&城池防守战",
         "kingExp": 0,
@@ -341,6 +355,7 @@
         "bg_img_id": 502,
         "script_id": "S_3100",
         "fixReward": "60001&80",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&城池防守战",
         "kingExp": 0,
@@ -365,6 +380,7 @@
         "bg_img_id": 502,
         "script_id": "S_3100",
         "fixReward": "60001&92",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&城池防守战",
         "kingExp": 0,
@@ -389,6 +405,7 @@
         "bg_img_id": 502,
         "script_id": "S_3100",
         "fixReward": "60001&104",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&城池防守战",
         "kingExp": 0,
@@ -413,6 +430,7 @@
         "bg_img_id": 502,
         "script_id": "S_3100",
         "fixReward": "60001&116",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&城池防守战",
         "kingExp": 0,
@@ -437,6 +455,7 @@
         "bg_img_id": 502,
         "script_id": "S_3100",
         "fixReward": "60001&128",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&城池防守战",
         "kingExp": 0,
@@ -461,6 +480,7 @@
         "bg_img_id": 502,
         "script_id": "S_3100",
         "fixReward": "60001&140",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&城池防守战",
         "kingExp": 0,
@@ -485,6 +505,7 @@
         "bg_img_id": 503,
         "script_id": "S_3200",
         "fixReward": "31001&20000",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&矿石争夺战",
         "kingExp": 0,
@@ -509,6 +530,7 @@
         "bg_img_id": 503,
         "script_id": "S_3200",
         "fixReward": "31001&24000",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&矿石争夺战",
         "kingExp": 0,
@@ -533,6 +555,7 @@
         "bg_img_id": 503,
         "script_id": "S_3200",
         "fixReward": "31001&28000",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&矿石争夺战",
         "kingExp": 0,
@@ -557,6 +580,7 @@
         "bg_img_id": 503,
         "script_id": "S_3200",
         "fixReward": "31001&32000",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&矿石争夺战",
         "kingExp": 0,
@@ -581,6 +605,7 @@
         "bg_img_id": 503,
         "script_id": "S_3200",
         "fixReward": "31001&36000",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&矿石争夺战",
         "kingExp": 0,
@@ -605,6 +630,7 @@
         "bg_img_id": 503,
         "script_id": "S_3200",
         "fixReward": "31001&40000",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&矿石争夺战",
         "kingExp": 0,
@@ -629,6 +655,7 @@
         "bg_img_id": 503,
         "script_id": "S_3200",
         "fixReward": "31001&44000",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&矿石争夺战",
         "kingExp": 0,
@@ -653,6 +680,7 @@
         "bg_img_id": 503,
         "script_id": "S_3200",
         "fixReward": "31001&48000",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&矿石争夺战",
         "kingExp": 0,
@@ -677,6 +705,7 @@
         "bg_img_id": 503,
         "script_id": "S_3200",
         "fixReward": "31001&52000",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&矿石争夺战",
         "kingExp": 0,
@@ -701,6 +730,7 @@
         "bg_img_id": 503,
         "script_id": "S_3200",
         "fixReward": "31001&56000",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&矿石争夺战",
         "kingExp": 0,
@@ -724,7 +754,8 @@
         "dispatchJsonId": 3300,
         "bg_img_id": 504,
         "script_id": "S_3300",
-        "fixReward": "11001&50",
+        "fixReward": "11002&8|11001&10",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&矿场保卫战",
         "kingExp": 0,
@@ -748,7 +779,8 @@
         "dispatchJsonId": 3301,
         "bg_img_id": 504,
         "script_id": "S_3300",
-        "fixReward": "11001&60",
+        "fixReward": "11002&10|11001&10",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&矿场保卫战",
         "kingExp": 0,
@@ -772,7 +804,8 @@
         "dispatchJsonId": 3302,
         "bg_img_id": 504,
         "script_id": "S_3300",
-        "fixReward": "11001&70",
+        "fixReward": "11002&10|11001&20",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&矿场保卫战",
         "kingExp": 0,
@@ -796,7 +829,8 @@
         "dispatchJsonId": 3303,
         "bg_img_id": 504,
         "script_id": "S_3300",
-        "fixReward": "11001&80",
+        "fixReward": "11003&3|11002&4",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&矿场保卫战",
         "kingExp": 0,
@@ -820,7 +854,8 @@
         "dispatchJsonId": 3304,
         "bg_img_id": 504,
         "script_id": "S_3300",
-        "fixReward": "11001&90",
+        "fixReward": "11003&3|11002&6",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&矿场保卫战",
         "kingExp": 0,
@@ -844,7 +879,8 @@
         "dispatchJsonId": 3305,
         "bg_img_id": 504,
         "script_id": "S_3300",
-        "fixReward": "11001&100",
+        "fixReward": "11003&4|11002&4",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&矿场保卫战",
         "kingExp": 0,
@@ -868,7 +904,8 @@
         "dispatchJsonId": 3306,
         "bg_img_id": 504,
         "script_id": "S_3300",
-        "fixReward": "11001&110",
+        "fixReward": "11003&4|11002&6",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&矿场保卫战",
         "kingExp": 0,
@@ -892,7 +929,8 @@
         "dispatchJsonId": 3307,
         "bg_img_id": 504,
         "script_id": "S_3300",
-        "fixReward": "11001&120",
+        "fixReward": "11003&5|11002&4",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&矿场保卫战",
         "kingExp": 0,
@@ -916,7 +954,8 @@
         "dispatchJsonId": 3308,
         "bg_img_id": 504,
         "script_id": "S_3300",
-        "fixReward": "11001&130",
+        "fixReward": "11004&1|11002&6",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&矿场保卫战",
         "kingExp": 0,
@@ -940,7 +979,8 @@
         "dispatchJsonId": 3309,
         "bg_img_id": 504,
         "script_id": "S_3300",
-        "fixReward": "11001&140",
+        "fixReward": "11004&1|11003&2",
+        "conditionReward": "31002&20&0|31002&40&1",
         "warType": 4,
         "gk_name": "每日&矿场保卫战",
         "kingExp": 0,
@@ -965,6 +1005,7 @@
         "bg_img_id": 0,
         "script_id": 0,
         "fixReward": 0,
+        "conditionReward": 0,
         "warType": 0,
         "gk_name": 0,
         "kingExp": 0,