diff --git a/bin/json/game_caravancity.json b/bin/json/game_caravancity.json
index 41c6e99f6..ab097ec27 100644
--- a/bin/json/game_caravancity.json
+++ b/bin/json/game_caravancity.json
@@ -33,15 +33,14 @@
     "citytype": 1,
     "citytypenum": 2,
     "special": [
-      "1",
-      "2",
-      "4",
-      "6"
+      "21000001",
+      "21000002",
+      "21000003",
+      "21000004"
     ],
     "specialnum": 500,
     "exspecial": [
-      "21000002",
-      "21000001"
+      "21000009"
     ],
     "exspecialnum": 1500,
     "Orspecial": 1000,
@@ -51,9 +50,7 @@
     "sptalk": 11003,
     "buytalk": 11004,
     "cityeventpro": 50000,
-    "cityevent": [
-      1
-    ]
+    "cityevent": 1
   },
   {
     "id": 102,
@@ -89,15 +86,14 @@
     "citytype": 1,
     "citytypenum": 3,
     "special": [
-      "3",
-      "4",
-      "5",
-      "6"
+      "21000001",
+      "21000002",
+      "21000003",
+      "21000007"
     ],
     "specialnum": 500,
     "exspecial": [
-      "1",
-      "2"
+      "21000004"
     ],
     "exspecialnum": 1600,
     "Orspecial": 1000,
@@ -107,9 +103,7 @@
     "sptalk": 11003,
     "buytalk": 11004,
     "cityeventpro": 100000,
-    "cityevent": [
-      1
-    ]
+    "cityevent": 1
   },
   {
     "id": 103,
@@ -146,15 +140,14 @@
     "citytype": 1,
     "citytypenum": 4,
     "special": [
-      "2",
-      "3",
-      "4",
-      "6"
+      "21000001",
+      "21000002",
+      "21000003",
+      "21000004"
     ],
     "specialnum": 500,
     "exspecial": [
-      "1",
-      "5"
+      "21000005"
     ],
     "exspecialnum": 1700,
     "Orspecial": 1000,
@@ -164,9 +157,7 @@
     "sptalk": 11003,
     "buytalk": 11004,
     "cityeventpro": 50000,
-    "cityevent": [
-      1
-    ]
+    "cityevent": 1
   },
   {
     "id": 104,
@@ -203,15 +194,14 @@
     "citytype": 1,
     "citytypenum": 3,
     "special": [
-      "1",
-      "2",
-      "4",
-      "5"
+      "21000001",
+      "21000002",
+      "21000003",
+      "21000004"
     ],
     "specialnum": 500,
     "exspecial": [
-      "3",
-      "6"
+      "21000006"
     ],
     "exspecialnum": 1800,
     "Orspecial": 1000,
@@ -221,9 +211,7 @@
     "sptalk": 11003,
     "buytalk": 11004,
     "cityeventpro": 100000,
-    "cityevent": [
-      1
-    ]
+    "cityevent": 1
   },
   {
     "id": 105,
@@ -259,15 +247,14 @@
     "citytype": 1,
     "citytypenum": 4,
     "special": [
-      "1",
-      "3",
-      "4",
-      "6"
+      "21000001",
+      "21000002",
+      "21000003",
+      "21000009"
     ],
     "specialnum": 500,
     "exspecial": [
-      "2",
-      "5"
+      "21000007"
     ],
     "exspecialnum": 1900,
     "Orspecial": 1000,
@@ -277,8 +264,6 @@
     "sptalk": 11003,
     "buytalk": 11004,
     "cityeventpro": 50000,
-    "cityevent": [
-      1
-    ]
+    "cityevent": 1
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_caravanthing.json b/bin/json/game_caravanthing.json
index 077d31b9f..3c05d5ad1 100644
--- a/bin/json/game_caravanthing.json
+++ b/bin/json/game_caravanthing.json
@@ -25,7 +25,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "itemid": "21000002",
@@ -53,7 +54,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "itemid": "21000003",
@@ -81,7 +83,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "itemid": "21000004",
@@ -109,7 +112,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "itemid": "21000005",
@@ -137,7 +141,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "itemid": "21000006",
@@ -165,7 +170,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "itemid": "21000007",
@@ -193,7 +199,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "itemid": "21000008",
@@ -221,7 +228,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "itemid": "21000009",
@@ -249,7 +257,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "itemid": "21000010",
@@ -277,7 +286,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "itemid": "21000011",
@@ -305,7 +315,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "itemid": "21000012",
@@ -333,7 +344,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "itemid": "21000013",
@@ -361,7 +373,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "itemid": "21000014",
@@ -389,7 +402,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "itemid": "21000015",
@@ -417,7 +431,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "itemid": "21000016",
@@ -445,7 +460,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "itemid": "21000017",
@@ -473,7 +489,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "itemid": "21000018",
@@ -501,7 +518,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "itemid": "21000019",
@@ -529,7 +547,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "itemid": "21000020",
@@ -557,7 +576,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "itemid": "21000021",
@@ -585,6 +605,7 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json
index e8646bd77..eb0bf013c 100644
--- a/bin/json/game_hero.json
+++ b/bin/json/game_hero.json
@@ -1472,7 +1472,7 @@
     "type": 1,
     "ip": 6,
     "sd": 1,
-    "handbook": 1,
+    "handbook": -1,
     "prefab": "24001",
     "rotation": "0|0|0",
     "revolve": 0,
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index 00cbf4474..748f05066 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -12685,7 +12685,7 @@
     "decompose_get": [],
     "access": [],
     "use_skip": 11001,
-    "upper_limit": 80,
+    "upper_limit": 999,
     "img": "icon_mcs",
     "intr": {
       "key": "item_item_intr_356",
@@ -12701,7 +12701,7 @@
     },
     "usetype": 2,
     "color": 4,
-    "bagtype": 1,
+    "bagtype": 0,
     "index": 1,
     "special_type": 0,
     "time": 0,
@@ -12716,7 +12716,7 @@
     "decompose_get": [],
     "access": [],
     "use_skip": 11001,
-    "upper_limit": 80,
+    "upper_limit": 999,
     "img": "wp_icon_jjcq",
     "intr": {
       "key": "item_item_intr_357",
@@ -12732,7 +12732,7 @@
     },
     "usetype": 2,
     "color": 4,
-    "bagtype": 1,
+    "bagtype": 0,
     "index": 1,
     "special_type": 0,
     "time": 0,
@@ -12747,7 +12747,7 @@
     "decompose_get": [],
     "access": [],
     "use_skip": 11001,
-    "upper_limit": 80,
+    "upper_limit": 999,
     "img": "icon_st03",
     "intr": {
       "key": "item_item_intr_358",
@@ -12763,7 +12763,7 @@
     },
     "usetype": 2,
     "color": 4,
-    "bagtype": 1,
+    "bagtype": 0,
     "index": 1,
     "special_type": 0,
     "time": 0,
@@ -12778,7 +12778,7 @@
     "decompose_get": [],
     "access": [],
     "use_skip": 11001,
-    "upper_limit": 80,
+    "upper_limit": 999,
     "img": "icon_st03",
     "intr": {
       "key": "item_item_intr_359",
@@ -12794,7 +12794,7 @@
     },
     "usetype": 2,
     "color": 4,
-    "bagtype": 1,
+    "bagtype": 0,
     "index": 1,
     "special_type": 0,
     "time": 0,
@@ -12809,7 +12809,7 @@
     "decompose_get": [],
     "access": [],
     "use_skip": 11001,
-    "upper_limit": 80,
+    "upper_limit": 999,
     "img": "icon_st03",
     "intr": {
       "key": "item_item_intr_360",
@@ -12825,7 +12825,7 @@
     },
     "usetype": 2,
     "color": 4,
-    "bagtype": 1,
+    "bagtype": 0,
     "index": 1,
     "special_type": 0,
     "time": 0,
@@ -12840,7 +12840,7 @@
     "decompose_get": [],
     "access": [],
     "use_skip": 11001,
-    "upper_limit": 80,
+    "upper_limit": 999,
     "img": "icon_st03",
     "intr": {
       "key": "item_item_intr_361",
@@ -12856,7 +12856,7 @@
     },
     "usetype": 2,
     "color": 4,
-    "bagtype": 1,
+    "bagtype": 0,
     "index": 1,
     "special_type": 0,
     "time": 0,
@@ -12871,7 +12871,7 @@
     "decompose_get": [],
     "access": [],
     "use_skip": 11001,
-    "upper_limit": 80,
+    "upper_limit": 999,
     "img": "icon_st03",
     "intr": {
       "key": "item_item_intr_362",
@@ -12887,7 +12887,7 @@
     },
     "usetype": 2,
     "color": 4,
-    "bagtype": 1,
+    "bagtype": 0,
     "index": 1,
     "special_type": 0,
     "time": 0,
@@ -12902,7 +12902,7 @@
     "decompose_get": [],
     "access": [],
     "use_skip": 11001,
-    "upper_limit": 80,
+    "upper_limit": 999,
     "img": "icon_st03",
     "intr": {
       "key": "item_item_intr_363",
@@ -12918,7 +12918,7 @@
     },
     "usetype": 2,
     "color": 4,
-    "bagtype": 1,
+    "bagtype": 0,
     "index": 1,
     "special_type": 0,
     "time": 0,
@@ -12933,7 +12933,7 @@
     "decompose_get": [],
     "access": [],
     "use_skip": 11001,
-    "upper_limit": 80,
+    "upper_limit": 999,
     "img": "icon_st03",
     "intr": {
       "key": "item_item_intr_364",
@@ -12949,7 +12949,7 @@
     },
     "usetype": 2,
     "color": 4,
-    "bagtype": 1,
+    "bagtype": 0,
     "index": 1,
     "special_type": 0,
     "time": 0,
@@ -12964,7 +12964,7 @@
     "decompose_get": [],
     "access": [],
     "use_skip": 11001,
-    "upper_limit": 80,
+    "upper_limit": 999,
     "img": "icon_st03",
     "intr": {
       "key": "item_item_intr_365",
@@ -12980,7 +12980,7 @@
     },
     "usetype": 2,
     "color": 4,
-    "bagtype": 1,
+    "bagtype": 0,
     "index": 1,
     "special_type": 0,
     "time": 0,
@@ -12995,7 +12995,7 @@
     "decompose_get": [],
     "access": [],
     "use_skip": 11001,
-    "upper_limit": 80,
+    "upper_limit": 999,
     "img": "icon_st03",
     "intr": {
       "key": "item_item_intr_366",
@@ -13011,7 +13011,7 @@
     },
     "usetype": 2,
     "color": 4,
-    "bagtype": 1,
+    "bagtype": 0,
     "index": 1,
     "special_type": 0,
     "time": 0,
@@ -13026,7 +13026,7 @@
     "decompose_get": [],
     "access": [],
     "use_skip": 11001,
-    "upper_limit": 80,
+    "upper_limit": 999,
     "img": "icon_st03",
     "intr": {
       "key": "item_item_intr_367",
@@ -13042,7 +13042,7 @@
     },
     "usetype": 2,
     "color": 4,
-    "bagtype": 1,
+    "bagtype": 0,
     "index": 1,
     "special_type": 0,
     "time": 0,
@@ -13057,7 +13057,7 @@
     "decompose_get": [],
     "access": [],
     "use_skip": 11001,
-    "upper_limit": 80,
+    "upper_limit": 999,
     "img": "icon_st03",
     "intr": {
       "key": "item_item_intr_368",
@@ -13073,7 +13073,7 @@
     },
     "usetype": 2,
     "color": 4,
-    "bagtype": 1,
+    "bagtype": 0,
     "index": 1,
     "special_type": 0,
     "time": 0,
@@ -13088,7 +13088,7 @@
     "decompose_get": [],
     "access": [],
     "use_skip": 11001,
-    "upper_limit": 80,
+    "upper_limit": 999,
     "img": "icon_st03",
     "intr": {
       "key": "item_item_intr_369",
@@ -13104,7 +13104,7 @@
     },
     "usetype": 2,
     "color": 4,
-    "bagtype": 1,
+    "bagtype": 0,
     "index": 1,
     "special_type": 0,
     "time": 0,
@@ -13119,7 +13119,7 @@
     "decompose_get": [],
     "access": [],
     "use_skip": 11001,
-    "upper_limit": 80,
+    "upper_limit": 999,
     "img": "icon_st03",
     "intr": {
       "key": "item_item_intr_370",
@@ -13135,7 +13135,7 @@
     },
     "usetype": 2,
     "color": 4,
-    "bagtype": 1,
+    "bagtype": 0,
     "index": 1,
     "special_type": 0,
     "time": 0,
@@ -13150,7 +13150,7 @@
     "decompose_get": [],
     "access": [],
     "use_skip": 11001,
-    "upper_limit": 80,
+    "upper_limit": 999,
     "img": "icon_st03",
     "intr": {
       "key": "item_item_intr_371",
@@ -13166,7 +13166,7 @@
     },
     "usetype": 2,
     "color": 4,
-    "bagtype": 1,
+    "bagtype": 0,
     "index": 1,
     "special_type": 0,
     "time": 0,
@@ -13181,7 +13181,7 @@
     "decompose_get": [],
     "access": [],
     "use_skip": 11001,
-    "upper_limit": 80,
+    "upper_limit": 999,
     "img": "icon_st03",
     "intr": {
       "key": "item_item_intr_372",
@@ -13197,7 +13197,7 @@
     },
     "usetype": 2,
     "color": 4,
-    "bagtype": 1,
+    "bagtype": 0,
     "index": 1,
     "special_type": 0,
     "time": 0,
@@ -13212,7 +13212,7 @@
     "decompose_get": [],
     "access": [],
     "use_skip": 11001,
-    "upper_limit": 80,
+    "upper_limit": 999,
     "img": "icon_st03",
     "intr": {
       "key": "item_item_intr_373",
@@ -13228,7 +13228,7 @@
     },
     "usetype": 2,
     "color": 4,
-    "bagtype": 1,
+    "bagtype": 0,
     "index": 1,
     "special_type": 0,
     "time": 0,
@@ -13243,7 +13243,7 @@
     "decompose_get": [],
     "access": [],
     "use_skip": 11001,
-    "upper_limit": 80,
+    "upper_limit": 999,
     "img": "icon_st03",
     "intr": {
       "key": "item_item_intr_374",
@@ -13259,7 +13259,7 @@
     },
     "usetype": 2,
     "color": 4,
-    "bagtype": 1,
+    "bagtype": 0,
     "index": 1,
     "special_type": 0,
     "time": 0,
@@ -13274,7 +13274,7 @@
     "decompose_get": [],
     "access": [],
     "use_skip": 11001,
-    "upper_limit": 80,
+    "upper_limit": 999,
     "img": "icon_st03",
     "intr": {
       "key": "item_item_intr_375",
@@ -13290,7 +13290,7 @@
     },
     "usetype": 2,
     "color": 4,
-    "bagtype": 1,
+    "bagtype": 0,
     "index": 1,
     "special_type": 0,
     "time": 0,
@@ -13305,7 +13305,7 @@
     "decompose_get": [],
     "access": [],
     "use_skip": 11001,
-    "upper_limit": 80,
+    "upper_limit": 999,
     "img": "icon_st03",
     "intr": {
       "key": "item_item_intr_376",
diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json
index 041ad274b..37581a7f6 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -6,7 +6,7 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_125004011",
-      "text": "队长技"
+      "text": "队长技能"
     },
     "ico": "dzj_buff_dkts_pink",
     "CorrectPos": 0,
@@ -475,7 +475,7 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_135002011",
-      "text": "队长技"
+      "text": "队长技能"
     },
     "ico": "dzj_buff_mzts_orange",
     "CorrectPos": 0,
@@ -1074,9 +1074,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_124003011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_mzts_orange",
+    "ico": "dzj_buff_dkts_orange",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -1596,7 +1596,7 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_134006011",
-      "text": "队长技"
+      "text": "队长技能"
     },
     "ico": "dzj_buff_sdts_blue",
     "CorrectPos": 0,
@@ -2240,7 +2240,7 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_125001011",
-      "text": "队长技"
+      "text": "队长技能"
     },
     "ico": "dzj_buff_fyts_green",
     "CorrectPos": 0,
@@ -3061,7 +3061,7 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_144005011",
-      "text": "队长技"
+      "text": "队长技能"
     },
     "ico": "dzj_buff_gjts_red",
     "CorrectPos": 0,
@@ -3705,7 +3705,7 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_135001011",
-      "text": "队长技"
+      "text": "队长技能"
     },
     "ico": "dzj_buff_gjts_blue",
     "CorrectPos": 0,
@@ -4416,7 +4416,7 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_124004011",
-      "text": "队长技"
+      "text": "队长技能"
     },
     "ico": "dzj_buff_mzts_blue",
     "CorrectPos": 0,
@@ -4769,7 +4769,7 @@
       "key": "skill_skill_atk_Name_124004311",
       "text": "致命回旋"
     },
-    "ico": "jn_icon_003",
+    "ico": "jn_24004_3",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_3",
@@ -4803,7 +4803,7 @@
       "key": "skill_skill_atk_Name_124004311",
       "text": "致命回旋"
     },
-    "ico": "jn_icon_003",
+    "ico": "jn_24004_3",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_3",
@@ -4900,9 +4900,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_144006011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_gjts_red",
+    "ico": "dzj_buff_smts_red",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -5588,7 +5588,7 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_115005011",
-      "text": "队长技"
+      "text": "队长技能"
     },
     "ico": "dzj_buff_fyts_red",
     "CorrectPos": 0,
@@ -5966,7 +5966,7 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_115004011",
-      "text": "队长技"
+      "text": "队长技能"
     },
     "ico": "dzj_buff_mzts_orange",
     "CorrectPos": 0,
@@ -6600,9 +6600,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_124002011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_fyts_green",
+    "ico": "dzj_buff_mzts_green",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -7046,7 +7046,7 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_114007011",
-      "text": "队长技"
+      "text": "队长技能"
     },
     "ico": "dzj_buff_fyts_green",
     "CorrectPos": 0,
@@ -7561,7 +7561,7 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_114003011",
-      "text": "队长技"
+      "text": "队长技能"
     },
     "ico": "dzj_buff_sdts_red",
     "CorrectPos": 0,
@@ -8045,7 +8045,7 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_145003011",
-      "text": "队长技"
+      "text": "队长技能"
     },
     "ico": "dzj_buff_smts_red",
     "CorrectPos": 0,
@@ -8505,7 +8505,7 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_135003011",
-      "text": "队长技"
+      "text": "队长技能"
     },
     "ico": "dzj_buff_dkts_blue",
     "CorrectPos": 0,
@@ -8806,7 +8806,7 @@
       "key": "skill_skill_atk_Name_151005111",
       "text": "双重攻势"
     },
-    "ico": "jn_icon_052",
+    "ico": "jn_51005_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -8835,7 +8835,7 @@
       "key": "skill_skill_atk_Name_151005211",
       "text": "力之回旋"
     },
-    "ico": "jn_icon_053",
+    "ico": "jn_51005_2",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_2",
@@ -8864,9 +8864,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_113003011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_sdts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -9363,9 +9363,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_135005011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_smts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -9857,9 +9857,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_115001011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_bjts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -9983,9 +9983,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_145001011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_gjts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -10346,7 +10346,7 @@
     },
     "Desc": {
       "key": "skill_skill_atk_Desc_145001311_1",
-      "text": "乌龟大师净化自身所有减益状态，同时驱散敌方所有增益状态，随后对敌方造成攻击力420%的伤害，共附加2回合[color=#e5621b]防御下降[/color][/color]状态。"
+      "text": "乌龟大师净化自身所有减益状态，同时驱散敌方所有增益状态，随后对敌方造成攻击力420%的伤害，共附加2回合[color=#e5621b]防御下降[/color]状态。"
     },
     "buffid": [
       390001007
@@ -10854,9 +10854,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_124008011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_gjts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -11373,9 +11373,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_134008011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_smts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -12477,9 +12477,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_143002011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_sdts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -12835,9 +12835,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_114006011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_sdts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -12954,7 +12954,7 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_135006011",
-      "text": "队长技"
+      "text": "队长技能"
     },
     "ico": "dzj_buff_dkts_blue",
     "CorrectPos": 0,
@@ -13372,7 +13372,7 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_134002011",
-      "text": "队长技"
+      "text": "队长技能"
     },
     "ico": "dzj_buff_dkts_blue",
     "CorrectPos": 0,
@@ -13756,9 +13756,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_124005011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_gjts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -14188,9 +14188,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_125003011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_sdts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -14769,9 +14769,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_133003011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_bjts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -15162,7 +15162,7 @@
     },
     "Desc": {
       "key": "skill_skill_atk_Desc_143001111_1",
-      "text": "阿比盖尔·斯通对敌方1个目标造成攻击力300%的伤害，并有75%概率附加2回合[color=#e5621b]防御下降[/color][/color]状态。"
+      "text": "阿比盖尔·斯通对敌方1个目标造成攻击力300%的伤害，并有75%概率附加2回合[color=#e5621b]防御下降[/color]状态。"
     },
     "buffid": [
       390001007
@@ -15615,9 +15615,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_134003011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_gjts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -16099,9 +16099,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_144004011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_mzts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -16542,9 +16542,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_134007011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_gjts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -17470,9 +17470,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_113001011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_fyts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -17957,9 +17957,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_114005011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_mzts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -18443,7 +18443,7 @@
       "key": "skill_skill_atk_Name_133001111",
       "text": "兽骨击打"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_33001_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -18472,7 +18472,7 @@
       "key": "skill_skill_atk_Name_133001211",
       "text": "血色号角"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_33001_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -18501,7 +18501,7 @@
       "key": "skill_skill_atk_Name_133001311",
       "text": "腾跃冰原"
     },
-    "ico": "jn_35003_3",
+    "ico": "jn_33001_3",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_3",
@@ -18516,7 +18516,7 @@
     },
     "Desc": {
       "key": "skill_skill_atk_Desc_133001311_1",
-      "text": "巫嘎对敌方1个目标造成攻击力300%的伤害，并附加1回合[color=#e5621b]冰冻[/color]以及2回合[color=#e5621b]防御下降[/color][/color]状态。"
+      "text": "巫嘎对敌方1个目标造成攻击力300%的伤害，并附加1回合[color=#e5621b]冰冻[/color]以及2回合[color=#e5621b]防御下降[/color]状态。"
     },
     "buffid": [],
     "map": ""
@@ -18528,9 +18528,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_143003011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_fyts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -19101,9 +19101,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_115002011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_gjts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -19465,9 +19465,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_113005011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_smts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -19496,7 +19496,7 @@
       "key": "skill_skill_atk_Name_113005111",
       "text": "前冲：肚皮顶"
     },
-    "ico": "jn_51006_1",
+    "ico": "jn_13005_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -19526,7 +19526,7 @@
       "key": "skill_skill_atk_Name_113005111",
       "text": "前冲：肚皮顶"
     },
-    "ico": "jn_51006_1",
+    "ico": "jn_13005_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -19556,7 +19556,7 @@
       "key": "skill_skill_atk_Name_113005111",
       "text": "前冲：肚皮顶"
     },
-    "ico": "jn_51006_1",
+    "ico": "jn_13005_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -19586,7 +19586,7 @@
       "key": "skill_skill_atk_Name_113005111",
       "text": "前冲：肚皮顶"
     },
-    "ico": "jn_51006_1",
+    "ico": "jn_13005_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -19616,7 +19616,7 @@
       "key": "skill_skill_atk_Name_113005111",
       "text": "前冲：肚皮顶"
     },
-    "ico": "jn_51006_1",
+    "ico": "jn_13005_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -19646,7 +19646,7 @@
       "key": "skill_skill_atk_Name_113005211",
       "text": "附魔：小指头"
     },
-    "ico": "jn_51006_2",
+    "ico": "jn_13005_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -19678,7 +19678,7 @@
       "key": "skill_skill_atk_Name_113005311",
       "text": "舞蹈狂欢夜"
     },
-    "ico": "jn_13001_3",
+    "ico": "jn_13005_3",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_3",
@@ -19710,7 +19710,7 @@
       "key": "skill_skill_atk_Name_113005311",
       "text": "舞蹈狂欢夜"
     },
-    "ico": "jn_13001_3",
+    "ico": "jn_13005_3",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_3",
@@ -19742,7 +19742,7 @@
       "key": "skill_skill_atk_Name_113005311",
       "text": "舞蹈狂欢夜"
     },
-    "ico": "jn_13001_3",
+    "ico": "jn_13005_3",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_3",
@@ -19772,9 +19772,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_124009011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_bjts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -20291,9 +20291,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_124001011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_gjts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -20825,7 +20825,7 @@
       "key": "skill_skill_atk_Name_151007111",
       "text": "麻醉针"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_51007_1",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_1",
@@ -20854,7 +20854,7 @@
       "key": "skill_skill_atk_Name_151007211",
       "text": "捕捉网"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_51007_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -20898,7 +20898,7 @@
     },
     "Desc": {
       "key": "skill_skill_atk_Desc_133002111_1",
-      "text": "坦克对敌方1个目标发起2段攻击，每段造成攻击力100%的伤害，并有35%概率附加2回合[color=#e5621b]防御下降[/color][/color]状态。"
+      "text": "坦克对敌方1个目标发起2段攻击，每段造成攻击力100%的伤害，并有35%概率附加2回合[color=#e5621b]防御下降[/color]状态。"
     },
     "buffid": [
       390001007
@@ -22532,7 +22532,7 @@
       "key": "skill_skill_atk_Name_114002111",
       "text": "嚣张气焰"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_14002_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -22547,7 +22547,7 @@
     },
     "Desc": {
       "key": "skill_skill_atk_Desc_114002111_1",
-      "text": "攻击1个敌方，伤害为自身攻击力30%和最大生命值4。"
+      "text": "大龙对敌方1个目标造成攻击力30%的伤害，追加自身最大生命值6%的伤害，并有50%概率附加1回合[color=#e5621b]挑衅[/color] 状态。"
     },
     "buffid": [],
     "map": ""
@@ -22561,7 +22561,7 @@
       "key": "skill_skill_atk_Name_114002211",
       "text": "嗜血反扑"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_14002_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -22577,7 +22577,7 @@
     },
     "Desc": {
       "key": "skill_skill_atk_Desc_114002211_1",
-      "text": "攻击时为目标附加1回合[color=#37d8a9]荷鲁斯之眼[/color] 。"
+      "text": "攻击时为目标附加1回合[color=#37d8a9]仇视[/color] 。己方除自身外任意目标遭到携带该标记的目标攻击时，自身有60%概率进行反击攻击者；自身受击时有15%概率使用嚣张气焰反击，并为自身回复最大生命值10%的生命。"
     },
     "buffid": [],
     "map": ""
@@ -22591,7 +22591,7 @@
       "key": "skill_skill_atk_Name_114002311",
       "text": "弱肉强食"
     },
-    "ico": "jn_35003_3",
+    "ico": "jn_14002_3",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_3",
@@ -22606,7 +22606,7 @@
     },
     "Desc": {
       "key": "skill_skill_atk_Desc_114002311_1",
-      "text": "攻击敌方，伤害为自身攻击力90%和已损失生命值15%，70%概率为目标附加2回合[color=#e5621b]攻击下降[/color]。"
+      "text": "攻击敌方，伤害为自身攻击力100%和自身已损失生命值15%，70%概率为目标附加2回合[color=#e5621b]攻击下降[/color]。"
     },
     "buffid": [],
     "map": ""
@@ -22620,7 +22620,7 @@
       "key": "skill_skill_atk_Name_143007111",
       "text": "破敌横钩"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_43007_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -22649,7 +22649,7 @@
       "key": "skill_skill_atk_Name_143007211",
       "text": "老练包扎"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_43007_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -22678,7 +22678,7 @@
       "key": "skill_skill_atk_Name_143007311",
       "text": "博克烙印"
     },
-    "ico": "jn_35003_3",
+    "ico": "jn_43007_3",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_3",
@@ -22707,7 +22707,7 @@
       "key": "skill_skill_atk_Name_134001111",
       "text": "口若悬河"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_34001_1",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_1",
@@ -22736,7 +22736,7 @@
       "key": "skill_skill_atk_Name_134001211",
       "text": "威风凛凛"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_34001_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -22765,7 +22765,7 @@
       "key": "skill_skill_atk_Name_134001311",
       "text": "山盟海誓"
     },
-    "ico": "jn_35003_3",
+    "ico": "jn_34001_3",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_3",
@@ -22879,9 +22879,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_124007011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_smts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -22999,9 +22999,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_123002011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_bjts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -23030,7 +23030,7 @@
       "key": "skill_skill_atk_Name_123002111",
       "text": "奋勇冲锋"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_23002_1",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_1",
@@ -23060,7 +23060,7 @@
       "key": "skill_skill_atk_Name_123002211",
       "text": "还施彼身"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_23002_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -23089,7 +23089,7 @@
       "key": "skill_skill_atk_Name_123002311",
       "text": "勋爵旨意"
     },
-    "ico": "jn_35003_3",
+    "ico": "jn_23002_3",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_3",
@@ -23117,9 +23117,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_123004011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_mzts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -23148,7 +23148,7 @@
       "key": "skill_skill_atk_Name_123004111",
       "text": "扳手打击"
     },
-    "ico": "jn_23001_1",
+    "ico": "jn_23004_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -23179,7 +23179,7 @@
       "key": "skill_skill_atk_Name_123004111",
       "text": "扳手打击"
     },
-    "ico": "jn_23001_1",
+    "ico": "jn_23004_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -23210,7 +23210,7 @@
       "key": "skill_skill_atk_Name_123004111",
       "text": "扳手打击"
     },
-    "ico": "jn_23001_1",
+    "ico": "jn_23004_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -23241,7 +23241,7 @@
       "key": "skill_skill_atk_Name_123004111",
       "text": "扳手打击"
     },
-    "ico": "jn_23001_1",
+    "ico": "jn_23004_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -23272,7 +23272,7 @@
       "key": "skill_skill_atk_Name_123004111",
       "text": "扳手打击"
     },
-    "ico": "jn_23001_1",
+    "ico": "jn_23004_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -23303,7 +23303,7 @@
       "key": "skill_skill_atk_Name_123004211",
       "text": "回旋投掷"
     },
-    "ico": "jn_23001_2",
+    "ico": "jn_23004_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -23334,7 +23334,7 @@
       "key": "skill_skill_atk_Name_123004211",
       "text": "回旋投掷"
     },
-    "ico": "jn_23001_2",
+    "ico": "jn_23004_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -23365,7 +23365,7 @@
       "key": "skill_skill_atk_Name_123004211",
       "text": "回旋投掷"
     },
-    "ico": "jn_23001_2",
+    "ico": "jn_23004_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -23396,7 +23396,7 @@
       "key": "skill_skill_atk_Name_123004211",
       "text": "回旋投掷"
     },
-    "ico": "jn_23001_2",
+    "ico": "jn_23004_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -23427,7 +23427,7 @@
       "key": "skill_skill_atk_Name_123004211",
       "text": "回旋投掷"
     },
-    "ico": "jn_23001_2",
+    "ico": "jn_23004_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -23458,7 +23458,7 @@
       "key": "skill_skill_atk_Name_123004311",
       "text": "抵达：终点站"
     },
-    "ico": "jn_23001_3",
+    "ico": "jn_23004_3",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_3",
@@ -23489,7 +23489,7 @@
       "key": "skill_skill_atk_Name_123004311",
       "text": "抵达：终点站"
     },
-    "ico": "jn_23001_3",
+    "ico": "jn_23004_3",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_3",
@@ -23520,7 +23520,7 @@
       "key": "skill_skill_atk_Name_123004311",
       "text": "抵达：终点站"
     },
-    "ico": "jn_23001_3",
+    "ico": "jn_23004_3",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_3",
@@ -23551,7 +23551,7 @@
       "key": "skill_skill_atk_Name_123004311",
       "text": "抵达：终点站"
     },
-    "ico": "jn_23001_3",
+    "ico": "jn_23004_3",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_3",
@@ -23582,7 +23582,7 @@
       "key": "skill_skill_atk_Name_123004311",
       "text": "抵达：终点站"
     },
-    "ico": "jn_23001_3",
+    "ico": "jn_23004_3",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_3",
@@ -23613,7 +23613,7 @@
       "key": "skill_skill_atk_Name_133005111",
       "text": "维京武勇"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_33005_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -23642,7 +23642,7 @@
       "key": "skill_skill_atk_Name_133005211",
       "text": "振奋怒吼"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_33005_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -23672,7 +23672,7 @@
       "key": "skill_skill_atk_Name_133005311",
       "text": "战无不胜"
     },
-    "ico": "jn_35003_3",
+    "ico": "jn_33005_3",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_3",
@@ -23702,7 +23702,7 @@
       "key": "skill_skill_atk_Name_151001111",
       "text": "泡泡射击"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_51001_1",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_1",
@@ -23731,7 +23731,7 @@
       "key": "skill_skill_atk_Name_151012111",
       "text": "拳猴之怒"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_51012_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -23760,7 +23760,7 @@
       "key": "skill_skill_atk_Name_151012211",
       "text": "背水一战"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_51012_2",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_2",
@@ -23789,7 +23789,7 @@
       "key": "skill_skill_atk_Name_151013111",
       "text": "横冲直撞"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_51013_1",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_1",
@@ -23818,7 +23818,7 @@
       "key": "skill_skill_atk_Name_151013211",
       "text": "攻其不备"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_51013_2",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_2",
@@ -23848,7 +23848,7 @@
       "key": "skill_skill_atk_Name_151014111",
       "text": "飞矛投掷"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_51014_1",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_1",
@@ -23877,7 +23877,7 @@
       "key": "skill_skill_atk_Name_151014211",
       "text": "振奋呼吼"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_51014_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -24023,7 +24023,7 @@
       "key": "skill_skill_atk_Name_144003111",
       "text": "说谎的男孩"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_44003_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -24053,7 +24053,7 @@
       "key": "skill_skill_atk_Name_144003211",
       "text": "变废为宝"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_44003_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -24083,7 +24083,7 @@
       "key": "skill_skill_atk_Name_144003311",
       "text": "匹诺曹出击"
     },
-    "ico": "jn_35003_3",
+    "ico": "jn_44003_3",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_3",
@@ -24111,9 +24111,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_115003011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_gjts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -24580,9 +24580,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_143004011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_gjts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -24611,7 +24611,7 @@
       "key": "skill_skill_atk_Name_143004111",
       "text": "奋不顾身"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_43004_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -24640,7 +24640,7 @@
       "key": "skill_skill_atk_Name_143004211",
       "text": "缤纷棒棒糖"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_43004_2",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_2",
@@ -24669,7 +24669,7 @@
       "key": "skill_skill_atk_Name_143004311",
       "text": "姜饼人诅咒"
     },
-    "ico": "jn_35003_3",
+    "ico": "jn_43004_3",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_3",
@@ -24698,7 +24698,7 @@
       "key": "skill_skill_atk_Name_123003111",
       "text": "主调小夜曲"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_23003_1",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_1",
@@ -24727,7 +24727,7 @@
       "key": "skill_skill_atk_Name_123003211",
       "text": "复调奏鸣曲"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_23003_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -24756,7 +24756,7 @@
       "key": "skill_skill_atk_Name_123003311",
       "text": "乐终章：赴生"
     },
-    "ico": "jn_35003_3",
+    "ico": "jn_23003_3",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_3",
@@ -24786,7 +24786,7 @@
       "key": "skill_skill_atk_Name_144001111",
       "text": "强袭头槌"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_44001_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -24816,7 +24816,7 @@
       "key": "skill_skill_atk_Name_144001211",
       "text": "锋锐利齿"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_44001_2",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_2",
@@ -24846,7 +24846,7 @@
       "key": "skill_skill_atk_Name_144001311",
       "text": "鲨之巨浪"
     },
-    "ico": "jn_35003_3",
+    "ico": "jn_44001_3",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_3",
@@ -24874,9 +24874,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_135004011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_gjts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -24905,7 +24905,7 @@
       "key": "skill_skill_atk_Name_135004111",
       "text": "敏捷扫堂腿"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_35004_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -24934,7 +24934,7 @@
       "key": "skill_skill_atk_Name_135004211",
       "text": "狡黠烟雾弹"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_35004_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -24963,7 +24963,7 @@
       "key": "skill_skill_atk_Name_135004311",
       "text": "传奇血红爪"
     },
-    "ico": "jn_35003_3",
+    "ico": "jn_35004_3",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_3",
@@ -24990,9 +24990,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_124006011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_smts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -25021,7 +25021,7 @@
       "key": "skill_skill_atk_Name_124006111",
       "text": "红灯：爆炸"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_24006_1",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_1",
@@ -25050,7 +25050,7 @@
       "key": "skill_skill_atk_Name_124006211",
       "text": "黄灯：复苏"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_24006_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -25079,7 +25079,7 @@
       "key": "skill_skill_atk_Name_124006311",
       "text": "绿灯：净化"
     },
-    "ico": "jn_35003_3",
+    "ico": "jn_24006_3",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_3",
@@ -25106,9 +25106,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_114004011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_smts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -25137,7 +25137,7 @@
       "key": "skill_skill_atk_Name_114004111",
       "text": "暗影之源"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_14004_1",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_1",
@@ -25166,7 +25166,7 @@
       "key": "skill_skill_atk_Name_114004211",
       "text": "福泽苍生"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_14004_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -25195,7 +25195,7 @@
       "key": "skill_skill_atk_Name_114004311",
       "text": "阿卡迪亚祈愿"
     },
-    "ico": "jn_35003_3",
+    "ico": "jn_14004_3",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_3",
@@ -25222,9 +25222,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_133004011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_gjts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -25253,7 +25253,7 @@
       "key": "skill_skill_atk_Name_133004111",
       "text": "灵巧鞭笞"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_33004_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -25282,7 +25282,7 @@
       "key": "skill_skill_atk_Name_133004211",
       "text": "无惧破阵"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_33004_2",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_2",
@@ -25311,7 +25311,7 @@
       "key": "skill_skill_atk_Name_133004311",
       "text": "野性狩猎"
     },
-    "ico": "jn_35003_3",
+    "ico": "jn_33004_3",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_3",
@@ -25339,9 +25339,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_134005011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_smts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -25587,7 +25587,7 @@
       "key": "skill_skill_atk_Name_134005311",
       "text": "永暗契约"
     },
-    "ico": "jn_34005_4",
+    "ico": "jn_34005_3",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_4",
@@ -25618,7 +25618,7 @@
       "key": "skill_skill_atk_Name_134005311",
       "text": "永暗契约"
     },
-    "ico": "jn_34005_5",
+    "ico": "jn_34005_3",
     "CorrectPos": 0,
     "IsMelee": 2,
     "act": "Skill_5",
@@ -25649,7 +25649,7 @@
       "key": "skill_skill_atk_Name_134005311",
       "text": "永暗契约"
     },
-    "ico": "jn_34005_6",
+    "ico": "jn_34005_3",
     "CorrectPos": 0,
     "IsMelee": 3,
     "act": "Skill_6",
@@ -25680,7 +25680,7 @@
       "key": "skill_skill_atk_Name_134005311",
       "text": "永暗契约"
     },
-    "ico": "jn_34005_7",
+    "ico": "jn_34005_3",
     "CorrectPos": 0,
     "IsMelee": 4,
     "act": "Skill_7",
@@ -25709,7 +25709,7 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_133006011",
-      "text": "队长技"
+      "text": "队长技能"
     },
     "ico": "dzj_buff_dkts_blue",
     "CorrectPos": 0,
@@ -25742,7 +25742,7 @@
       "key": "skill_skill_atk_Name_133006111",
       "text": "智勇双全"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_33006_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -25771,7 +25771,7 @@
       "key": "skill_skill_atk_Name_133006211",
       "text": "飞转之钥"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_33006_2",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_2",
@@ -25800,7 +25800,7 @@
       "key": "skill_skill_atk_Name_133006311",
       "text": "安睡：摇篮曲"
     },
-    "ico": "jn_35003_3",
+    "ico": "jn_33006_3",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_3",
@@ -25827,9 +25827,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_125002011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_smts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
@@ -25858,7 +25858,7 @@
       "key": "skill_skill_atk_Name_125002111",
       "text": "脱帽致辞"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_25002_1",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_1",
@@ -25887,7 +25887,7 @@
       "key": "skill_skill_atk_Name_125002211",
       "text": "无拘无束"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_25002_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -25918,7 +25918,7 @@
       "key": "skill_skill_atk_Name_125002311",
       "text": "妙手空空"
     },
-    "ico": "jn_35003_3",
+    "ico": "jn_25002_3",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_3",
@@ -25947,7 +25947,7 @@
       "key": "skill_skill_atk_Name_145002111",
       "text": "宗师法球"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_45002_1",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_1",
@@ -25976,7 +25976,7 @@
       "key": "skill_skill_atk_Name_145002211",
       "text": "登神之路"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_45002_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -26006,7 +26006,7 @@
       "key": "skill_skill_atk_Name_145002311",
       "text": "疾行圣术"
     },
-    "ico": "jn_35003_3",
+    "ico": "jn_45002_3",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_3",
@@ -26035,7 +26035,7 @@
       "key": "skill_skill_atk_Name_153005111",
       "text": "棍翻刺拳"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_53005_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -26064,7 +26064,7 @@
       "key": "skill_skill_atk_Name_153005211",
       "text": "士气鼓舞"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_53005_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -26093,7 +26093,7 @@
       "key": "skill_skill_atk_Name_153006111",
       "text": "威仪"
     },
-    "ico": "jn_35003_1",
+    "ico": "jn_53006_1",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_1",
@@ -26122,7 +26122,7 @@
       "key": "skill_skill_atk_Name_153006211",
       "text": "圣裁"
     },
-    "ico": "jn_35003_2",
+    "ico": "jn_53006_2",
     "CorrectPos": 0,
     "IsMelee": 1,
     "act": "Skill_2",
@@ -26152,7 +26152,7 @@
       "key": "skill_skill_atk_Name_153006311",
       "text": "恩典"
     },
-    "ico": "jn_35003_3",
+    "ico": "jn_53006_3",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_3",
@@ -26239,9 +26239,9 @@
     "UnavailablePlayTypes": [],
     "Name": {
       "key": "skill_skill_atk_Name_144002011",
-      "text": "队长技"
+      "text": "队长技能"
     },
-    "ico": "dzj_buff_dkts_blue",
+    "ico": "dzj_buff_fyts_blue",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "",
diff --git a/modules/caravan/api_buyorsell.go b/modules/caravan/api_buyorsell.go
index 92ae433c5..3940da215 100644
--- a/modules/caravan/api_buyorsell.go
+++ b/modules/caravan/api_buyorsell.go
@@ -178,10 +178,9 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe
 			caravan.Items[k].Price = totla / caravan.Items[k].Count
 			// 同步更新该城市的 出售货物信息
 			cityInfo.Count[k] += v
-			itemConf, err := this.module.configure.GetItemConfigureData(k)
-			if err == nil {
-				//if itemConf, err := this.configure.GetCaravanGoods(k); err == nil { // 更新商店库存
-				if cityInfo.Count[k] > itemConf.UpperLimit {
+
+			if itemConf, err := this.configure.GetCaravanGoods(k); err == nil { // 更新商店库存
+				if cityInfo.Count[k] > itemConf.Goodsnum {
 					errdata = &pb.ErrorData{
 						Code:  pb.ErrorCode_TrollBuyMax, // 商品数量不足
 						Title: pb.ErrorCode_TrollBuyMax.ToString(),
diff --git a/modules/caravan/api_gotocity.go b/modules/caravan/api_gotocity.go
index 1227e55be..11787ad25 100644
--- a/modules/caravan/api_gotocity.go
+++ b/modules/caravan/api_gotocity.go
@@ -58,8 +58,14 @@ func (this *apiComp) GotoCity(session comm.IUserSession, req *pb.CaravanGotoCity
 	}
 	if bNewTask { // 到该城市随机一个新的任务
 		if newCity, e := this.module.configure.GetCaravanCity(req.City); e == nil {
-			ipos := comm.GetRandW(newCity.Cityevent)
-			list.Eventid = newCity.Cityevent[ipos] // 新的任务
+			if elist, err := this.module.configure.GetCaravanEventByGroup(newCity.Cityevent); err == nil {
+				var randW []int32
+				for _, v := range elist {
+					randW = append(randW, v.Eventweight)
+				}
+				list.Eventid = elist[comm.GetRandW(randW)].Id
+			}
+			// 新的任务
 			// list.Tasktime = configure.Now().Unix()
 			// if event := this.module.configure.GetCaravanEventById(list.Eventid); event != nil {
 			// 	list.Task = event.Worldtask // 对应世界任务组
diff --git a/modules/caravan/comp_configure.go b/modules/caravan/comp_configure.go
index dc6c8c221..bcf911bf1 100644
--- a/modules/caravan/comp_configure.go
+++ b/modules/caravan/comp_configure.go
@@ -7,6 +7,7 @@ import (
 	"go_dreamfactory/modules"
 	"go_dreamfactory/sys/configure"
 	cfg "go_dreamfactory/sys/configure/structs"
+	"sync"
 )
 
 var moduleName = "caravan"
@@ -24,6 +25,8 @@ const (
 type configureComp struct {
 	modules.MCompConfigure
 	module *Caravan
+	lock   sync.RWMutex
+	event  map[int32][]*cfg.GameCaravanEventData
 }
 
 //组件初始化接口
@@ -36,6 +39,19 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
 	this.LoadConfigure(game_caravan_thing, cfg.NewGameCaravanThing)
 	this.LoadConfigure(game_caravan_event, cfg.NewGameCaravanEvent)
 	this.LoadConfigure(game_caravan_rank, cfg.NewGameCaravanRank)
+	configure.RegisterConfigure(game_caravan_event, cfg.NewGameCaravanRank, func() {
+		this.lock.Lock()
+		if v, err := this.GetConfigure(game_caravan_event); err != nil {
+			this.module.Errorf("err:%v", err)
+			return
+		} else {
+			this.event = make(map[int32][]*cfg.GameCaravanEventData, 0)
+			for _, v := range v.(*cfg.GameCaravanEvent).GetDataList() {
+				this.event[v.Eventgroup] = append(this.event[v.Eventgroup], v)
+			}
+		}
+		this.lock.Unlock()
+	})
 	return
 }
 
@@ -139,20 +155,14 @@ func (this *configureComp) GetAllCaravanItem() (data []*cfg.GameCaravanThingData
 }
 
 // 获取随机事件
-func (this *configureComp) GetCaravanEventById(id int32) (data *cfg.GameCaravanEventData, err error) {
+func (this *configureComp) GetCaravanEventByGroup(eventgroup int32) (data []*cfg.GameCaravanEventData, err error) {
 	var (
-		v interface{}
+		ok bool
 	)
-	if v, err = this.GetConfigure(game_caravan_event); err == nil {
-		if configure, ok := v.(*cfg.GameCaravanEvent); ok {
-			if data = configure.Get(id); data == nil {
-				err = comm.NewNotFoundConfErr(moduleName, game_caravan_event, id)
-				this.module.Errorln(err)
-			}
-			return
-		}
+	if data, ok = this.event[eventgroup]; !ok {
+		err = comm.NewNotFoundConfErr(moduleName, game_caravan_event, eventgroup)
 	}
-	err = comm.NewNotFoundConfErr(moduleName, game_caravan_event, id)
+
 	return
 }
 
@@ -214,3 +224,19 @@ func (this *configureComp) GetCaravanRank(index int32) (reward *cfg.GameCaravanR
 	err = comm.NewNotFoundConfErr(moduleName, game_caravan_rank, index)
 	return
 }
+func (this *configureComp) GetCaravanEventById(id int32) (data *cfg.GameCaravanEventData, err error) {
+	var (
+		v interface{}
+	)
+	if v, err = this.GetConfigure(game_caravan_event); err == nil {
+		if configure, ok := v.(*cfg.GameCaravanEvent); ok {
+			if data = configure.Get(id); data == nil {
+				err = comm.NewNotFoundConfErr(moduleName, game_caravan_event, id)
+				this.module.Errorln(err)
+			}
+			return
+		}
+	}
+	err = comm.NewNotFoundConfErr(moduleName, game_caravan_event, id)
+	return
+}
diff --git a/modules/caravan/module.go b/modules/caravan/module.go
index 7b50e296b..f06b0ac35 100644
--- a/modules/caravan/module.go
+++ b/modules/caravan/module.go
@@ -224,6 +224,7 @@ func (this *Caravan) refreshCaravanCityInfo(uid string, caravan *pb.DBCaravan) {
 
 // 校验随机事件是否超时
 func (this *Caravan) CheckCaravanTask(session comm.IUserSession, data *pb.DBCaravan) (bTimeOut bool) {
+
 	if data.Eventid != 0 {
 		if list, err := this.configure.GetCaravanEventById(data.Eventid); err == nil {
 			// 校验任务是否超时
diff --git a/modules/gm/module.go b/modules/gm/module.go
index 06b5ed495..4f74d30da 100644
--- a/modules/gm/module.go
+++ b/modules/gm/module.go
@@ -149,11 +149,13 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er
 				// 发所有道具
 				item := this.configure.GetAllItemConfigure()
 				for _, v := range item {
-					res = append(res, &cfg.Gameatn{
-						A: "item",
-						T: v.Id,
-						N: 100,
-					})
+					if v.Bagtype != 0 {
+						res = append(res, &cfg.Gameatn{
+							A: "item",
+							T: v.Id,
+							N: 100,
+						})
+					}
 				}
 				errdata = this.DispenseRes(session, res, true)
 				if errdata != nil {
diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go
index a600d78ae..e3ba9615d 100644
--- a/modules/hero/model_hero.go
+++ b/modules/hero/model_hero.go
@@ -469,7 +469,7 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, hero *pb.DBHero, ex
 	maxLv = this.module.configure.GetHeroMaxLv(hero.Star)
 	// 校验玩家等级
 	if _user := this.module.ModuleUser.GetUser(session.GetUserId()); _user != nil {
-		if expConf := this.module.configure.GetPlayerlvConf(_user.Lv); expConf == nil {
+		if expConf := this.module.configure.GetPlayerlvConf(_user.Lv); expConf != nil {
 			if maxLv > expConf.HeroLv {
 				maxLv = expConf.HeroLv // 英雄最大等级限制
 			}
diff --git a/sys/configure/structs/Game.CaravanCityData.go b/sys/configure/structs/Game.CaravanCityData.go
index b36c0d318..3f328da7f 100644
--- a/sys/configure/structs/Game.CaravanCityData.go
+++ b/sys/configure/structs/Game.CaravanCityData.go
@@ -34,7 +34,7 @@ type GameCaravanCityData struct {
     Sptalk int32
     Buytalk int32
     Cityeventpro int32
-    Cityevent []int32
+    Cityevent int32
 }
 
 const TypeId_GameCaravanCityData = 145138895
@@ -132,20 +132,7 @@ func (_v *GameCaravanCityData)Deserialize(_buf map[string]interface{}) (err erro
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sptalk"].(float64); !_ok_ { err = errors.New("sptalk error"); return }; _v.Sptalk = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buytalk"].(float64); !_ok_ { err = errors.New("buytalk error"); return }; _v.Buytalk = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cityeventpro"].(float64); !_ok_ { err = errors.New("cityeventpro error"); return }; _v.Cityeventpro = int32(_tempNum_) }
-     {
-                var _arr_ []interface{}
-                var _ok_ bool
-                if _arr_, _ok_ = _buf["cityevent"].([]interface{}); !_ok_ { err = errors.New("cityevent error"); return }
-
-                _v.Cityevent = make([]int32, 0, len(_arr_))
-                
-                for _, _e_ := range _arr_ {
-                    var _list_v_ int32
-                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
-                    _v.Cityevent = append(_v.Cityevent, _list_v_)
-                }
-            }
-
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cityevent"].(float64); !_ok_ { err = errors.New("cityevent error"); return }; _v.Cityevent = int32(_tempNum_) }
     return
 }
 
diff --git a/sys/configure/structs/Game.CaravanThingData.go b/sys/configure/structs/Game.CaravanThingData.go
index c4bfe4e4a..38be2158a 100644
--- a/sys/configure/structs/Game.CaravanThingData.go
+++ b/sys/configure/structs/Game.CaravanThingData.go
@@ -21,6 +21,7 @@ type GameCaravanThingData struct {
     FluctuationRange int32
     Pricemin int32
     Pricemax int32
+    Goodsnum int32
 }
 
 const TypeId_GameCaravanThingData = 638455774
@@ -105,6 +106,7 @@ func (_v *GameCaravanThingData)Deserialize(_buf map[string]interface{}) (err err
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["FluctuationRange"].(float64); !_ok_ { err = errors.New("FluctuationRange error"); return }; _v.FluctuationRange = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pricemin"].(float64); !_ok_ { err = errors.New("pricemin error"); return }; _v.Pricemin = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pricemax"].(float64); !_ok_ { err = errors.New("pricemax error"); return }; _v.Pricemax = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["goodsnum"].(float64); !_ok_ { err = errors.New("goodsnum error"); return }; _v.Goodsnum = int32(_tempNum_) }
     return
 }