diff --git a/bin/json/game_arenachallengenpc.json b/bin/json/game_arenachallengenpc.json
index d519208d1..154229ddb 100644
--- a/bin/json/game_arenachallengenpc.json
+++ b/bin/json/game_arenachallengenpc.json
@@ -5,7 +5,7 @@
     "open_value": 10,
     "BattleReadyID": 110,
     "monsterformat_id": [
-      301011,
+      101011,
       301027
     ],
     "stroy_id_front": 201,
@@ -36,7 +36,7 @@
     "open_value": 11,
     "BattleReadyID": 110,
     "monsterformat_id": [
-      301012
+      101021
     ],
     "stroy_id_front": 201,
     "stroy_id_after": 201,
@@ -66,7 +66,7 @@
     "open_value": 12,
     "BattleReadyID": 110,
     "monsterformat_id": [
-      301013
+      101031
     ],
     "stroy_id_front": 201,
     "stroy_id_after": 201,
@@ -96,7 +96,7 @@
     "open_value": 13,
     "BattleReadyID": 110,
     "monsterformat_id": [
-      301014
+      101032
     ],
     "stroy_id_front": 201,
     "stroy_id_after": 201,
@@ -126,7 +126,7 @@
     "open_value": 14,
     "BattleReadyID": 110,
     "monsterformat_id": [
-      301015
+      101041
     ],
     "stroy_id_front": 201,
     "stroy_id_after": 201,
@@ -156,7 +156,7 @@
     "open_value": 15,
     "BattleReadyID": 110,
     "monsterformat_id": [
-      301016
+      101041
     ],
     "stroy_id_front": 201,
     "stroy_id_after": 201,
@@ -186,7 +186,7 @@
     "open_value": 16,
     "BattleReadyID": 110,
     "monsterformat_id": [
-      301017
+      101041
     ],
     "stroy_id_front": 201,
     "stroy_id_after": 201,
@@ -216,7 +216,7 @@
     "open_value": 17,
     "BattleReadyID": 110,
     "monsterformat_id": [
-      301018
+      101041
     ],
     "stroy_id_front": 201,
     "stroy_id_after": 201,
@@ -246,7 +246,7 @@
     "open_value": 18,
     "BattleReadyID": 110,
     "monsterformat_id": [
-      301019
+      101041
     ],
     "stroy_id_front": 201,
     "stroy_id_after": 201,
@@ -276,7 +276,7 @@
     "open_value": 19,
     "BattleReadyID": 110,
     "monsterformat_id": [
-      301020
+      101041
     ],
     "stroy_id_front": 201,
     "stroy_id_after": 201,
@@ -306,7 +306,7 @@
     "open_value": 20,
     "BattleReadyID": 110,
     "monsterformat_id": [
-      301021
+      101041
     ],
     "stroy_id_front": 201,
     "stroy_id_after": 201,
@@ -336,7 +336,7 @@
     "open_value": 21,
     "BattleReadyID": 110,
     "monsterformat_id": [
-      301022
+      101041
     ],
     "stroy_id_front": 201,
     "stroy_id_after": 201,
@@ -366,7 +366,7 @@
     "open_value": 22,
     "BattleReadyID": 110,
     "monsterformat_id": [
-      301023
+      101041
     ],
     "stroy_id_front": 201,
     "stroy_id_after": 201,
@@ -396,7 +396,7 @@
     "open_value": 23,
     "BattleReadyID": 110,
     "monsterformat_id": [
-      301024
+      101041
     ],
     "stroy_id_front": 201,
     "stroy_id_after": 201,
@@ -426,7 +426,7 @@
     "open_value": 24,
     "BattleReadyID": 110,
     "monsterformat_id": [
-      301025
+      101041
     ],
     "stroy_id_front": 201,
     "stroy_id_after": 201,
@@ -456,7 +456,7 @@
     "open_value": 25,
     "BattleReadyID": 110,
     "monsterformat_id": [
-      301026
+      101041
     ],
     "stroy_id_front": 201,
     "stroy_id_after": 201,
diff --git a/bin/json/game_coin.json b/bin/json/game_coin.json
index bf37dbbfe..0a3705c1d 100644
--- a/bin/json/game_coin.json
+++ b/bin/json/game_coin.json
@@ -33,8 +33,8 @@
     "access": 113,
     "star": 0,
     "race": 0,
-    "img": "wp_icon_0002",
-    "ico": "wp_icon_0002",
+    "img": "icon_hy",
+    "ico": "icon_hy",
     "intr": "Currency used to purchase goods",
     "tipstxt": "Lack of experience"
   },
@@ -137,8 +137,8 @@
     "access": 156,
     "star": 0,
     "race": 0,
-    "img": "wp_icon_0002",
-    "ico": "wp_icon_0002",
+    "img": "icon_ry",
+    "ico": "icon_ry",
     "intr": "Currency used to purchase goods",
     "tipstxt": "Lack of experience"
   },
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index 48f6b6fb1..b0c355ae2 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -3103,8 +3103,8 @@
     "isani": 0,
     "star": 0,
     "race": 0,
-    "img": "wp_icon_10009",
-    "ico": "wp_icon_10009",
+    "img": "tj_icon_flower",
+    "ico": "tj_icon_flower",
     "intr": {
       "key": "itemdesc_120001",
       "text": "熔岩泰坦掉落初级材料，可用于打造装备"
@@ -3141,8 +3141,8 @@
     "isani": 0,
     "star": 0,
     "race": 0,
-    "img": "wp_icon_10010",
-    "ico": "wp_icon_10010",
+    "img": "tj_icon_yshy",
+    "ico": "tj_icon_yshy",
     "intr": {
       "key": "itemdesc_120002",
       "text": "熔岩泰坦掉落中级材料，可用于打造装备"
@@ -3179,8 +3179,8 @@
     "isani": 0,
     "star": 0,
     "race": 0,
-    "img": "wp_icon_10011",
-    "ico": "wp_icon_10011",
+    "img": "tj_icon_ttry",
+    "ico": "tj_icon_ttry",
     "intr": {
       "key": "itemdesc_120003",
       "text": "熔岩泰坦掉落高级材料，可用于打造装备"
@@ -3217,8 +3217,8 @@
     "isani": 0,
     "star": 0,
     "race": 0,
-    "img": "wp_icon_10012",
-    "ico": "wp_icon_10012",
+    "img": "tj_icon_hmkz",
+    "ico": "tj_icon_hmkz",
     "intr": {
       "key": "itemdesc_120004",
       "text": "森林泰坦掉落初级材料，可用于打造装备"
@@ -3255,8 +3255,8 @@
     "isani": 0,
     "star": 0,
     "race": 0,
-    "img": "wp_icon_10013",
-    "ico": "wp_icon_10013",
+    "img": "tj_icon_ljym",
+    "ico": "tj_icon_ljym",
     "intr": {
       "key": "itemdesc_120005",
       "text": "森林泰坦掉落中级材料，可用于打造装备"
@@ -3293,8 +3293,8 @@
     "isani": 0,
     "star": 0,
     "race": 0,
-    "img": "wp_icon_10014",
-    "ico": "wp_icon_10014",
+    "img": "tj_icon_emtm",
+    "ico": "tj_icon_emtm",
     "intr": {
       "key": "itemdesc_120006",
       "text": "森林泰坦掉落高级材料，可用于打造装备"
@@ -3331,8 +3331,8 @@
     "isani": 0,
     "star": 0,
     "race": 0,
-    "img": "wp_icon_10015",
-    "ico": "wp_icon_10015",
+    "img": "tj_icon_cjbs",
+    "ico": "tj_icon_cjbs",
     "intr": {
       "key": "itemdesc_120007",
       "text": "森林泰坦掉落初级材料，可用于打造装备"
@@ -3369,8 +3369,8 @@
     "isani": 0,
     "star": 0,
     "race": 0,
-    "img": "wp_icon_10016",
-    "ico": "wp_icon_10016",
+    "img": "tj_icon_zjbs",
+    "ico": "tj_icon_zjbs",
     "intr": {
       "key": "itemdesc_120008",
       "text": "森林泰坦掉落中级材料，可用于打造装备"
@@ -3407,8 +3407,8 @@
     "isani": 0,
     "star": 0,
     "race": 0,
-    "img": "wp_icon_10017",
-    "ico": "wp_icon_10017",
+    "img": "tj_icon_gjbs",
+    "ico": "tj_icon_gjbs",
     "intr": {
       "key": "itemdesc_120009",
       "text": "森林泰坦掉落高级材料，可用于打造装备"
@@ -3445,8 +3445,8 @@
     "isani": 0,
     "star": 0,
     "race": 0,
-    "img": "wp_icon_10018",
-    "ico": "wp_icon_10018",
+    "img": "tj_icon_jls",
+    "ico": "tj_icon_jls",
     "intr": {
       "key": "itemdesc_120101",
       "text": "打造时添加精炼石，必出高品质装备"
@@ -3483,8 +3483,8 @@
     "isani": 0,
     "star": 0,
     "race": 0,
-    "img": "wp_icon_10019",
-    "ico": "wp_icon_10019",
+    "img": "tj_icon_tys02",
+    "ico": "tj_icon_tys02",
     "intr": {
       "key": "itemdesc_120102",
       "text": "打造时添加太阳石，可以选择打造的套装，添加大量太阳石可以选择打造的套装和套装部位"
@@ -3521,8 +3521,8 @@
     "isani": 0,
     "star": 0,
     "race": 0,
-    "img": "wp_icon_10020",
-    "ico": "wp_icon_10020",
+    "img": "tj_icon_rtys",
+    "ico": "tj_icon_rtys",
     "intr": {
       "key": "itemdesc_120103",
       "text": "打造时添加熔岩石，不增加熔炉CD"
@@ -3559,8 +3559,8 @@
     "isani": 0,
     "star": 0,
     "race": 0,
-    "img": "wp_icon_10021",
-    "ico": "wp_icon_10021",
+    "img": "tj_icon_mt",
+    "ico": "tj_icon_mt",
     "intr": {
       "key": "itemdesc_120104",
       "text": "清除熔炉的CD"
diff --git a/bin/json/game_pagoda.json b/bin/json/game_pagoda.json
index bb2de8f7a..59315ced5 100644
--- a/bin/json/game_pagoda.json
+++ b/bin/json/game_pagoda.json
@@ -24,7 +24,7 @@
       },
       {
         "a": "panda",
-        "t": "10006",
+        "t": "10010",
         "n": 1
       }
     ],
diff --git a/bin/json/game_shop.json b/bin/json/game_shop.json
index f7f4ccd94..988cda43a 100644
--- a/bin/json/game_shop.json
+++ b/bin/json/game_shop.json
@@ -141,10 +141,7 @@
     "shopitem": [
       40001,
       40002,
-      40003,
-      40004,
-      40005,
-      40006
+      40003
     ]
   },
   {
@@ -178,10 +175,7 @@
       50001,
       50002,
       50003,
-      50004,
-      50005,
-      50006,
-      50007
+      50004
     ]
   },
   {
@@ -207,13 +201,9 @@
     "rnum": -1,
     "rneed": [],
     "shopitem": [
-      50001,
-      50002,
-      50003,
-      50004,
-      50005,
-      50006,
-      50007
+      60001,
+      60002,
+      60003
     ]
   },
   {
diff --git a/bin/json/game_shopitem.json b/bin/json/game_shopitem.json
index feb742c88..18105432a 100644
--- a/bin/json/game_shopitem.json
+++ b/bin/json/game_shopitem.json
@@ -6125,7 +6125,7 @@
     "iteminfo": [
       {
         "a": "item",
-        "t": "110001",
+        "t": "600002",
         "n": 10
       }
     ],
@@ -6161,7 +6161,7 @@
     "iteminfo": [
       {
         "a": "item",
-        "t": "110002",
+        "t": "10017",
         "n": 10
       }
     ],
@@ -6197,7 +6197,7 @@
     "iteminfo": [
       {
         "a": "item",
-        "t": "120001",
+        "t": "600001",
         "n": 10
       }
     ],
@@ -6412,9 +6412,9 @@
     "id": 30001,
     "iteminfo": [
       {
-        "a": "attr",
-        "t": "diamond",
-        "n": 50
+        "a": "item",
+        "t": "600002",
+        "n": 1
       }
     ],
     "preview": false,
@@ -6423,7 +6423,7 @@
       {
         "a": "attr",
         "t": "friendPoint",
-        "n": 100
+        "n": 10
       }
     ],
     "sale": 1000,
@@ -6448,9 +6448,9 @@
     "id": 30002,
     "iteminfo": [
       {
-        "a": "attr",
-        "t": "diamond",
-        "n": 50
+        "a": "item",
+        "t": "600003",
+        "n": 1
       }
     ],
     "preview": false,
@@ -6459,7 +6459,7 @@
       {
         "a": "attr",
         "t": "friendPoint",
-        "n": 100
+        "n": 20
       }
     ],
     "sale": 1000,
@@ -6484,9 +6484,9 @@
     "id": 30003,
     "iteminfo": [
       {
-        "a": "attr",
-        "t": "diamond",
-        "n": 50
+        "a": "item",
+        "t": "600004",
+        "n": 1
       }
     ],
     "preview": false,
@@ -6520,9 +6520,9 @@
     "id": 40001,
     "iteminfo": [
       {
-        "a": "attr",
-        "t": "diamond",
-        "n": 50
+        "a": "item",
+        "t": "600005",
+        "n": 1
       }
     ],
     "preview": false,
@@ -6531,7 +6531,7 @@
       {
         "a": "attr",
         "t": "arenacoin",
-        "n": 1000
+        "n": 100
       }
     ],
     "sale": 1000,
@@ -6556,9 +6556,9 @@
     "id": 40002,
     "iteminfo": [
       {
-        "a": "attr",
-        "t": "diamond",
-        "n": 50
+        "a": "item",
+        "t": "600006",
+        "n": 1
       }
     ],
     "preview": false,
@@ -6567,7 +6567,7 @@
       {
         "a": "attr",
         "t": "arenacoin",
-        "n": 1000
+        "n": 250
       }
     ],
     "sale": 1000,
@@ -6593,7 +6593,7 @@
     "iteminfo": [
       {
         "a": "item",
-        "t": "30001",
+        "t": "600007",
         "n": 1
       }
     ],
@@ -6603,7 +6603,7 @@
       {
         "a": "attr",
         "t": "arenacoin",
-        "n": 200
+        "n": 1000
       }
     ],
     "sale": 1000,
@@ -6623,153 +6623,9 @@
     "mapidmin": 101,
     "mapidmax": 9999
   },
-  {
-    "key": 185,
-    "id": 40004,
-    "iteminfo": [
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 50
-      }
-    ],
-    "preview": false,
-    "probability": 1000,
-    "need": [
-      {
-        "a": "attr",
-        "t": "arenacoin",
-        "n": 200
-      }
-    ],
-    "sale": 1000,
-    "salelist": [
-      1000,
-      1000,
-      1000,
-      1000,
-      1000,
-      1000
-    ],
-    "buyminnum": 2,
-    "buymaxnum": 2,
-    "vip": 0,
-    "lvmin": 1,
-    "lvmax": 60,
-    "mapidmin": 101,
-    "mapidmax": 9999
-  },
-  {
-    "key": 186,
-    "id": 40005,
-    "iteminfo": [
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 50
-      }
-    ],
-    "preview": false,
-    "probability": 1000,
-    "need": [
-      {
-        "a": "attr",
-        "t": "arenacoin",
-        "n": 200
-      }
-    ],
-    "sale": 1000,
-    "salelist": [
-      1000,
-      1000,
-      1000,
-      1000,
-      1000,
-      1000
-    ],
-    "buyminnum": 2,
-    "buymaxnum": 2,
-    "vip": 0,
-    "lvmin": 1,
-    "lvmax": 60,
-    "mapidmin": 101,
-    "mapidmax": 9999
-  },
-  {
-    "key": 187,
-    "id": 40006,
-    "iteminfo": [
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 50
-      }
-    ],
-    "preview": false,
-    "probability": 1000,
-    "need": [
-      {
-        "a": "attr",
-        "t": "arenacoin",
-        "n": 50
-      }
-    ],
-    "sale": 1000,
-    "salelist": [
-      1000,
-      1000,
-      1000,
-      1000,
-      1000,
-      1000
-    ],
-    "buyminnum": 1,
-    "buymaxnum": 1,
-    "vip": 0,
-    "lvmin": 1,
-    "lvmax": 60,
-    "mapidmin": 101,
-    "mapidmax": 9999
-  },
-  {
-    "key": 188,
-    "id": 50001,
-    "iteminfo": [
-      {
-        "a": "item",
-        "t": "30001",
-        "n": 1
-      }
-    ],
-    "preview": false,
-    "probability": 1001,
-    "need": [
-      {
-        "a": "attr",
-        "t": "guildcoin",
-        "n": 400
-      }
-    ],
-    "sale": 1000,
-    "salelist": [
-      1000,
-      1000,
-      1000,
-      1000,
-      1000,
-      1000
-    ],
-    "buyminnum": 1,
-    "buymaxnum": 1,
-    "vip": 0,
-    "lvmin": 1,
-    "lvmax": 60,
-    "mapidmin": 101,
-    "mapidmax": 9999
-  },
   {
     "key": 189,
-    "id": 50002,
+    "id": 50001,
     "iteminfo": [
       {
         "a": "item",
@@ -6783,7 +6639,7 @@
       {
         "a": "attr",
         "t": "guildcoin",
-        "n": 400
+        "n": 200
       }
     ],
     "sale": 700,
@@ -6805,7 +6661,7 @@
   },
   {
     "key": 190,
-    "id": 50003,
+    "id": 50002,
     "iteminfo": [
       {
         "a": "item",
@@ -6841,7 +6697,7 @@
   },
   {
     "key": 191,
-    "id": 50004,
+    "id": 50003,
     "iteminfo": [
       {
         "a": "item",
@@ -6877,7 +6733,7 @@
   },
   {
     "key": 192,
-    "id": 50005,
+    "id": 50004,
     "iteminfo": [
       {
         "a": "item",
@@ -6911,78 +6767,6 @@
     "mapidmin": 101,
     "mapidmax": 9999
   },
-  {
-    "key": 193,
-    "id": 50006,
-    "iteminfo": [
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 50
-      }
-    ],
-    "preview": false,
-    "probability": 1006,
-    "need": [
-      {
-        "a": "attr",
-        "t": "guildcoin",
-        "n": 300
-      }
-    ],
-    "sale": 1000,
-    "salelist": [
-      1000,
-      1000,
-      1000,
-      1000,
-      1000,
-      1000
-    ],
-    "buyminnum": 1,
-    "buymaxnum": 1,
-    "vip": 0,
-    "lvmin": 1,
-    "lvmax": 60,
-    "mapidmin": 101,
-    "mapidmax": 9999
-  },
-  {
-    "key": 194,
-    "id": 50007,
-    "iteminfo": [
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 50
-      }
-    ],
-    "preview": false,
-    "probability": 1007,
-    "need": [
-      {
-        "a": "attr",
-        "t": "guildcoin",
-        "n": 1500
-      }
-    ],
-    "sale": 1000,
-    "salelist": [
-      1000,
-      1000,
-      1000,
-      1000,
-      1000,
-      1000
-    ],
-    "buyminnum": 1,
-    "buymaxnum": 1,
-    "vip": 0,
-    "lvmin": 1,
-    "lvmax": 60,
-    "mapidmin": 101,
-    "mapidmax": 9999
-  },
   {
     "key": 195,
     "id": 1000001,
@@ -7061,7 +6845,7 @@
     "iteminfo": [
       {
         "a": "item",
-        "t": "30001",
+        "t": "600001",
         "n": 10
       }
     ],
@@ -7071,7 +6855,7 @@
       {
         "a": "attr",
         "t": "moongold",
-        "n": 1
+        "n": 10
       }
     ],
     "sale": 1000,
@@ -7083,8 +6867,8 @@
       1000,
       1000
     ],
-    "buyminnum": 1,
-    "buymaxnum": 1,
+    "buyminnum": 99,
+    "buymaxnum": 99,
     "vip": 0,
     "lvmin": 1,
     "lvmax": 60,
@@ -7093,6 +6877,78 @@
   },
   {
     "key": 198,
+    "id": 60002,
+    "iteminfo": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 50
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "moongold",
+        "n": 50
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 99,
+    "buymaxnum": 99,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 199,
+    "id": 60003,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "30001",
+        "n": 1
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "moongold",
+        "n": 200
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 99,
+    "buymaxnum": 99,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 203,
     "id": 70001,
     "iteminfo": [
       {
@@ -7128,7 +6984,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 199,
+    "key": 204,
     "id": 70002,
     "iteminfo": [
       {
@@ -7164,7 +7020,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 200,
+    "key": 205,
     "id": 70003,
     "iteminfo": [
       {
@@ -7200,7 +7056,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 201,
+    "key": 206,
     "id": 70004,
     "iteminfo": [
       {
@@ -7236,7 +7092,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 202,
+    "key": 207,
     "id": 70005,
     "iteminfo": [
       {
@@ -7272,7 +7128,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 203,
+    "key": 208,
     "id": 70006,
     "iteminfo": [
       {
@@ -7308,7 +7164,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 204,
+    "key": 209,
     "id": 70007,
     "iteminfo": [
       {
@@ -7344,7 +7200,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 205,
+    "key": 210,
     "id": 70008,
     "iteminfo": [
       {
@@ -7380,7 +7236,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 206,
+    "key": 211,
     "id": 70009,
     "iteminfo": [
       {
@@ -7416,7 +7272,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 207,
+    "key": 212,
     "id": 70010,
     "iteminfo": [
       {
@@ -7452,7 +7308,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 208,
+    "key": 213,
     "id": 70011,
     "iteminfo": [
       {
@@ -7488,7 +7344,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 209,
+    "key": 214,
     "id": 70012,
     "iteminfo": [
       {
@@ -7524,7 +7380,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 210,
+    "key": 215,
     "id": 70013,
     "iteminfo": [
       {
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index aed08cf9c..95c44c911 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -15675,7 +15675,7 @@
   {
     "Id": 224005211,
     "EmitPR": 1000,
-    "From": 4,
+    "From": 1,
     "Where": [],
     "Order": "",
     "Limit": 10,
@@ -15701,7 +15701,7 @@
   {
     "Id": 224005212,
     "EmitPR": 1000,
-    "From": 4,
+    "From": 1,
     "Where": [],
     "Order": "",
     "Limit": 10,
diff --git a/bin/json/game_vikingbossskill.json b/bin/json/game_vikingbossskill.json
index c400fe1d1..e425e173f 100644
--- a/bin/json/game_vikingbossskill.json
+++ b/bin/json/game_vikingbossskill.json
@@ -100,56 +100,5 @@
       124004111,
       144005111
     ]
-  },
-  {
-    "bossid": 32,
-    "copytype": 4,
-    "name": {
-      "key": "viking_boss_1002",
-      "text": "冰之泰坦"
-    },
-    "introduce": {
-      "key": "viking_boss_1005",
-      "text": "冰霜泰坦巨人从极寒之地而来，没有什么比它更寒冷了"
-    },
-    "icon": "wjyz_img011",
-    "guardskill": [
-      124004111,
-      144005111
-    ]
-  },
-  {
-    "bossid": 33,
-    "copytype": 4,
-    "name": {
-      "key": "viking_boss_1003",
-      "text": "森林泰坦"
-    },
-    "introduce": {
-      "key": "viking_boss_1006",
-      "text": "森林泰坦诞生于广袤的森林之中，是所有动物们的守护神"
-    },
-    "icon": "wjyz_img013",
-    "guardskill": [
-      124004111,
-      144005111
-    ]
-  },
-  {
-    "bossid": 34,
-    "copytype": 4,
-    "name": {
-      "key": "viking_boss_1001",
-      "text": "武器BOSS"
-    },
-    "introduce": {
-      "key": "viking_boss_1006",
-      "text": "森林泰坦诞生于广袤的森林之中，是所有动物们的守护神"
-    },
-    "icon": "wjyz_img011",
-    "guardskill": [
-      124004111,
-      144005111
-    ]
   }
 ]
\ No newline at end of file
diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go
index 9f9adea1d..414c778df 100644
--- a/modules/hero/api_awaken.go
+++ b/modules/hero/api_awaken.go
@@ -59,19 +59,7 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
 	if code != pb.ErrorCode_Success {
 		return
 	}
-	// if _hero.SameCount > 1 { //有堆叠的情况
-	// 	// 克隆一个新的
-	// 	_hero.SameCount -= 1
-	// 	_hero.JuexProperty = map[string]int32{}
 
-	// 	newHero := this.module.modelHero.CloneNewHero(session.GetUserId(), _hero)
-	// 	_hero.JuexProperty = map[string]int32{}
-	// 	chanegCard = append(chanegCard, newHero)
-
-	// 	_heroMap["sameCount"] = 1
-	// 	_heroMap["horoscopeProperty"] = _hero.HoroscopeProperty
-	// }
-	//_hero.SameCount = 1
 	// 加属性 awakenData
 	if len(awakenData.Phasebonus) != 2 {
 		code = pb.ErrorCode_ConfigNoFound
@@ -112,23 +100,25 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
 	} else {
 		this.module.Errorf("no found userdata uid:%s", session.GetUserId())
 	}
+	var szTask []*comm.TaskParam
+	szTask = append(szTask, comm.GettaskParam(comm.Rtype34, 1, _hero.JuexingLv))
+	szTask = append(szTask, comm.GettaskParam(comm.Rtype119, _hero.JuexingLv))
+	szTask = append(szTask, comm.GettaskParam(comm.Rtype35, _hero.JuexingLv, utils.ToInt32(_hero.HeroID)))
 
-	//任务相关
-	this.module.ModuleRtask.SendToRtask(session, comm.Rtype34, 1, _hero.JuexingLv)
-	this.module.ModuleRtask.SendToRtask(session, comm.Rtype119, _hero.JuexingLv)
-	this.module.ModuleRtask.SendToRtask(session, comm.Rtype35, _hero.JuexingLv, utils.ToInt32(_hero.HeroID))
 	cfg := this.module.configure.GetHeroConfig(_hero.HeroID)
 	if cfg != nil {
-		this.module.ModuleRtask.SendToRtask(session, comm.Rtype121, cfg.Race, utils.ToInt32(_hero.HeroID), _hero.JuexingLv)
-		this.module.ModuleRtask.SendToRtask(session, comm.Rtype36, 1, cfg.Color, cfg.Job, cfg.Race, _hero.JuexingLv)
+		szTask = append(szTask, comm.GettaskParam(comm.Rtype121, cfg.Race, utils.ToInt32(_hero.HeroID), _hero.JuexingLv))
+		szTask = append(szTask, comm.GettaskParam(comm.Rtype36, 1, cfg.Color, cfg.Job, cfg.Race, _hero.JuexingLv))
+
 		//xx英雄满级、共鸣、觉醒至最高状态
 		nextAwaken := this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1)
 		if nextAwaken == nil { // 达到满级觉醒
 			if _hero.Lv == this.module.configure.GetHeroMaxLv(_hero.Star) {
-				this.module.ModuleRtask.SendToRtask(session, comm.Rtype37, 1, cfg.Color)
-				this.module.ModuleRtask.SendToRtask(session, comm.Rtype38, 1)
+				szTask = append(szTask, comm.GettaskParam(comm.Rtype37, 1, cfg.Color))
+				szTask = append(szTask, comm.GettaskParam(comm.Rtype38, 1))
 			}
 		}
 	}
+	go this.module.ModuleRtask.TriggerTask(session.GetUserId(), szTask...)
 	return
 }
diff --git a/modules/hero/api_info.go b/modules/hero/api_info.go
index f9f6d58d4..389298fc8 100644
--- a/modules/hero/api_info.go
+++ b/modules/hero/api_info.go
@@ -34,8 +34,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.HeroInfoReq) (code
 		uid = req.Uid
 	}
 
-	tag, _, b := utils.UIdSplit(uid)
-	if b {
+	if tag, _, ok := utils.UIdSplit(uid); ok {
 		if conn, err := db.ServerDBConn(tag); err == nil {
 			dbModel := db.NewDBModel(comm.TableHero, time.Hour, conn)
 			for _, v := range req.HeroId {
diff --git a/modules/hero/api_talentlearn.go b/modules/hero/api_talentlearn.go
index 0c21a7f72..fd387c690 100644
--- a/modules/hero/api_talentlearn.go
+++ b/modules/hero/api_talentlearn.go
@@ -41,8 +41,7 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe
 			return
 		}
 		// 数据校验
-		list, err := this.module.modelTalent.GetHerotalent(session.GetUserId())
-		if err == nil {
+		if list, err := this.module.modelTalent.GetHerotalent(session.GetUserId()); err == nil {
 			for _, v := range list {
 				if v.HeroId == req.Heroid {
 					talent = v
diff --git a/modules/martialhall/api_unlock.go b/modules/martialhall/api_unlock.go
index 7d9cd7662..927eebe02 100644
--- a/modules/martialhall/api_unlock.go
+++ b/modules/martialhall/api_unlock.go
@@ -84,6 +84,7 @@ func (this *apiComp) UnLock(session comm.IUserSession, req *pb.MartialhallUnLock
 	this.module.modelMartialhall.Change(session.GetUserId(), map[string]interface{}{
 		filed: pillar,
 	})
+
 	this.module.ModuleRtask.SendToRtask(session, comm.Rtype152, 1)
 	session.SendMsg(string(this.module.GetType()), "unlock", &pb.MartialhallUnLockResp{Issucc: true, Info: mart})
 	return
diff --git a/modules/practice/api_unLock.go b/modules/practice/api_unLock.go
index f98f49fa7..3f4d0bb16 100644
--- a/modules/practice/api_unLock.go
+++ b/modules/practice/api_unLock.go
@@ -51,7 +51,14 @@ func (this *apiComp) UnLock(session comm.IUserSession, req *pb.PracticeUnLockReq
 	if room.Pillarf.Isunlock == 0 {
 		room.Pillarf.Isunlock = 2
 	}
-
+	if pillarconfigure, err := this.module.configure.getGamePandamasMz(req.Index); err != nil {
+		code = pb.ErrorCode_ConfigNoFound
+		return
+	} else {
+		if code = this.module.DispenseRes(session, pillarconfigure.PhotoGuideUnlocking, true); code != pb.ErrorCode_Success {
+			return
+		}
+	}
 	this.module.modelPandata.Change(session.GetUserId(), map[string]interface{}{
 		filed:     pillar,
 		"pillarf": room.Pillarf,
diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go
index caaa81eac..ad495c633 100644
--- a/modules/viking/api_challengeover.go
+++ b/modules/viking/api_challengeover.go
@@ -152,16 +152,19 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
 		this.module.Errorf("no found userdata uid:%s", session.GetUserId())
 	}
 	// 随机任务统计
-	this.module.ModuleRtask.SendToRtask(session, comm.Rtype73, req.Difficulty, req.BossId, 1)
-	this.module.ModuleRtask.SendToRtask(session, comm.Rtype74, req.Difficulty, req.BossId)
-	this.module.ModuleRtask.SendToRtask(session, comm.Rtype78, req.Difficulty, req.BossId, req.Report.Costtime)
+	var szTask []*comm.TaskParam
+	szTask = append(szTask, comm.GettaskParam(comm.Rtype73, req.Difficulty, req.BossId, 1))
+	szTask = append(szTask, comm.GettaskParam(comm.Rtype74, req.Difficulty, req.BossId))
+	szTask = append(szTask, comm.GettaskParam(comm.Rtype78, req.Difficulty, req.BossId, req.Report.Costtime))
+
 	if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 {
 		for _, v := range req.Report.Info.Redflist[0].Team {
 			if v.Ishelp { // 判断是否有助战
-				this.module.ModuleRtask.SendToRtask(session, comm.Rtype79, req.Difficulty, req.BossId)
+				szTask = append(szTask, comm.GettaskParam(comm.Rtype79, req.Difficulty, req.BossId))
 				break
 			}
 		}
 	}
+	go this.module.ModuleRtask.TriggerTask(session.GetUserId(), szTask...)
 	return
 }
diff --git a/sys/configure/structs/Game.WorldTaskData.go b/sys/configure/structs/Game.WorldTaskData.go
index e5fd13e7a..92f0daca6 100644
--- a/sys/configure/structs/Game.WorldTaskData.go
+++ b/sys/configure/structs/Game.WorldTaskData.go
@@ -22,8 +22,8 @@ type GameWorldTaskData struct {
     TaskName string
     TaskDisplay string
     Npc []string
-    Receivenpc []string
     GetafterEvent []int32
+    Receivenpc []string
     Completetask int32
     AutoAccept int32
     Overtips int32
@@ -62,20 +62,6 @@ func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error)
                 }
             }
 
-     {
-                var _arr_ []interface{}
-                var _ok_ bool
-                if _arr_, _ok_ = _buf["receivenpc"].([]interface{}); !_ok_ { err = errors.New("receivenpc error"); return }
-
-                _v.Receivenpc = make([]string, 0, len(_arr_))
-                
-                for _, _e_ := range _arr_ {
-                    var _list_v_ string
-                    {  if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
-                    _v.Receivenpc = append(_v.Receivenpc, _list_v_)
-                }
-            }
-
      {
                 var _arr_ []interface{}
                 var _ok_ bool
@@ -90,6 +76,20 @@ func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error)
                 }
             }
 
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["receivenpc"].([]interface{}); !_ok_ { err = errors.New("receivenpc error"); return }
+
+                _v.Receivenpc = make([]string, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ string
+                    {  if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
+                    _v.Receivenpc = append(_v.Receivenpc, _list_v_)
+                }
+            }
+
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["completetask"].(float64); !_ok_ { err = errors.New("completetask error"); return }; _v.Completetask = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["auto_accept"].(float64); !_ok_ { err = errors.New("auto_accept error"); return }; _v.AutoAccept = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["overtips"].(float64); !_ok_ { err = errors.New("overtips error"); return }; _v.Overtips = int32(_tempNum_) }