上传配置代码

bin/json/game_celebration.json

@@ -12,7 +12,7 @@
     "days": 2,
     "tipstxt": {
       "key": "celebration_celebration_tipstxt_1",
-      "text": "每日前[color=#AAFF00]{0}[/color]次挑战猎魂任意boss，可以获得[color=#AAFF00]双倍奖励[/color]"
+      "text": "每日前[color=#AAFF00]{0}[/color]次挑战猎魂任意boss，可以获得双倍奖励"
     }
   },
   {
@@ -28,7 +28,7 @@
     "days": 2,
     "tipstxt": {
       "key": "celebration_celebration_tipstxt_2",
-      "text": "每日前[color=#AAFF00]{0}[/color]次挑战梦境回廊，可以获得[color=#AAFF00]双倍奖励[/color]"
+      "text": "每日前[color=#AAFF00]{0}[/color]次挑战梦境回廊，可以获得双倍奖励"
     }
   },
   {
@@ -48,7 +48,7 @@
     "days": 2,
     "tipstxt": {
       "key": "celebration_celebration_tipstxt_3",
-      "text": "每日前[color=#AAFF00]{0}[/color]次挑战维京远征，可以获得[color=#AAFF00]双倍奖励[/color]，每名boss每日分别只能挑战[color=#AAFF00]{0}[/color]次"
+      "text": "每日前[color=#AAFF00]{0}[/color]次挑战维京远征，可以获得双倍奖励，每名boss每日分别只能挑战[color=#AAFF00]{0}[/color]次"
     }
   }
 ]

bin/json/game_dragonplay.json

@@ -20,6 +20,42 @@
   {
     "key": 2,
     "id": "20030001",
+    "grow": 1,
+    "type": 3,
+    "exp": 100,
+    "time": 3,
+    "cd": 0,
+    "deplete": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 2
+      }
+    ],
+    "bubble": 14005,
+    "group": 10001
+  },
+  {
+    "key": 3,
+    "id": "20030001",
+    "grow": 1,
+    "type": 4,
+    "exp": 100,
+    "time": 3,
+    "cd": 0,
+    "deplete": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 3
+      }
+    ],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 4,
+    "id": "20030001",
     "grow": 2,
     "type": 1,
     "exp": 100,
@@ -36,7 +72,7 @@
     "group": 0
   },
   {
-    "key": 3,
+    "key": 5,
     "id": "20030001",
     "grow": 2,
     "type": 2,
@@ -54,7 +90,7 @@
     "group": 0
   },
   {
-    "key": 4,
+    "key": 6,
     "id": "20030001",
     "grow": 2,
     "type": 3,
@@ -69,10 +105,10 @@
       }
     ],
     "bubble": 14005,
-    "group": 0
+    "group": 10002
   },
   {
-    "key": 5,
+    "key": 7,
     "id": "20030001",
     "grow": 2,
     "type": 4,
@@ -90,7 +126,7 @@
     "group": 0
   },
   {
-    "key": 6,
+    "key": 8,
     "id": "20030001",
     "grow": 3,
     "type": 1,
@@ -108,7 +144,7 @@
     "group": 0
   },
   {
-    "key": 7,
+    "key": 9,
     "id": "20030001",
     "grow": 3,
     "type": 2,
@@ -126,7 +162,25 @@
     "group": 0
   },
   {
-    "key": 9,
+    "key": 10,
+    "id": "20030001",
+    "grow": 3,
+    "type": 4,
+    "exp": 100,
+    "time": 3,
+    "cd": 0,
+    "deplete": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 10
+      }
+    ],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 11,
     "id": "20030001",
     "grow": 3,
     "type": 5,

bin/json/game_gamesummarytab.json

@@ -10,7 +10,7 @@
       "x": -2000,
       "y": 2100
     },
-    "scale": 0.4,
+    "scale": 0.8,
     "usetext": {
       "key": "gamesummary_fathernode_usetext_1",
       "text": "探险！这是永远不会停歇的主题！"
@@ -27,7 +27,7 @@
       "x": -2363,
       "y": 1272
     },
-    "scale": 0.4,
+    "scale": 0.8,
     "usetext": {
       "key": "gamesummary_fathernode_usetext_2",
       "text": "探险！这是永远不会停歇的主题！从这里开始你的[color=#ffcc00]冒险之旅[/color]吧！"
@@ -44,7 +44,7 @@
       "x": -1500,
       "y": 243
     },
-    "scale": 0.4,
+    "scale": 0.85,
     "usetext": {
       "key": "gamesummary_fathernode_usetext_3",
       "text": "大战泰坦！打败泰坦获得的材料[color=#ffcc00]拿给铁匠铺的戈伯，他能帮你打造装备[/color]！"
@@ -78,7 +78,7 @@
       "x": -1324,
       "y": 0
     },
-    "scale": 0.4,
+    "scale": 0.8,
     "usetext": {
       "key": "gamesummary_fathernode_usetext_5",
       "text": "传说中用梦锻炼自我的地方。获胜后的护身符[color=#ffcc00]可以给守护者等级强化[/color]！"
@@ -95,7 +95,7 @@
       "x": -3065,
       "y": 754
     },
-    "scale": 0.4,
+    "scale": 0.65,
     "usetext": {
       "key": "gamesummary_fathernode_usetext_6",
       "text": "功夫熊猫世界的人真是喜欢塔啊,但挑战胜利的奖励也很大方！"
@@ -112,7 +112,7 @@
       "x": -3065,
       "y": 754
     },
-    "scale": 0.4,
+    "scale": 0.65,
     "usetext": {
       "key": "gamesummary_fathernode_usetext_7",
       "text": "点石成金的磨练地！挑战胜利可以[color=#ffcc00]获得教习在木人桩指导守护者[/color]！"
@@ -129,7 +129,7 @@
       "x": -3065,
       "y": 754
     },
-    "scale": 0.4,
+    "scale": 0.65,
     "usetext": {
       "key": "gamesummary_fathernode_usetext_8",
       "text": "这是[color=#ffcc00]每隔十五天[/color]开启的无穷无尽的挑战地！挑战胜利越多奖励越多！"
@@ -146,7 +146,7 @@
       "x": -3065,
       "y": 754
     },
-    "scale": 0.4,
+    "scale": 0.65,
     "usetext": {
       "key": "gamesummary_fathernode_usetext_9",
       "text": "万物相生，万物相克。使用[color=#ffcc00]同一属性的守护者组成阵容[/color]挑战这塔吧！"
@@ -163,7 +163,7 @@
       "x": -3055,
       "y": 967
     },
-    "scale": 0.4,
+    "scale": 0.8,
     "usetext": {
       "key": "gamesummary_fathernode_usetext_10",
       "text": "有人的地方就存在着纷争,·去战胜他人获得[color=#ffcc00]竞技币[/color]，在[color=#ffcc00]竞技商店兑换奖励[/color]吧！"
@@ -180,7 +180,7 @@
       "x": -1037,
       "y": 1864
     },
-    "scale": 0.4,
+    "scale": 0.8,
     "usetext": {
       "key": "gamesummary_fathernode_usetext_11",
       "text": "挑战深藏于原始人聚集地里的无尽秘境，[color=#ffcc00]获取食材大礼包与装备奖励吧[/color]！"
@@ -197,7 +197,7 @@
       "x": -3897,
       "y": 603
     },
-    "scale": 0.4,
+    "scale": 0.8,
     "usetext": {
       "key": "gamesummary_fathernode_usetext_12",
       "text": "巨怪商人们的脚步永不停歇,听说在他们那赚了足够多的瓶盖后可以有[color=#ffcc00]神秘大奖[/color]!"

bin/json/game_global.json

@@ -696,7 +696,7 @@
     ],
     "favorability_likes": 1500,
     "favorability_dislikes": 500,
-    "buzkashi_time": 120,
+    "buzkashi_time": 1000,
     "buzkashi_vreward": [
       {
         "a": "attr",
@@ -849,7 +849,6 @@
     },
     "dragon_interaction": 15,
     "dialogueclickcd": 0.5,
-    "doragon_item": "24012003",
+    "doragon_item": "24012003"
-    "sign_account": 28
   }
 ]

bin/json/game_gm.json

@@ -388,35 +388,5 @@
     },
     "data": "",
     "prefix": "bingo:library"
-  },
-  {
-    "id": 42,
-    "type": 1,
-    "text": {
-      "key": "GM_GM_text_42",
-      "text": "获得X级无牙仔"
-    },
-    "data": "21",
-    "prefix": "bingo:mts,20030001,{0}"
-  },
-  {
-    "id": 43,
-    "type": 1,
-    "text": {
-      "key": "GM_GM_text_43",
-      "text": "获得X级风里飞"
-    },
-    "data": "21",
-    "prefix": "bingo:mts,20030002,{0}"
-  },
-  {
-    "id": 44,
-    "type": 1,
-    "text": {
-      "key": "GM_GM_text_44",
-      "text": "获得X级葛伦科"
-    },
-    "data": "21",
-    "prefix": "bingo:mts,20030003,{0}"
   }
 ]

bin/json/game_hero.json

@@ -2586,7 +2586,7 @@
     "type": 1,
     "ip": 3,
     "sd": 1,
-    "handbook": 1,
+    "handbook": -1,
     "prefab": "33001",
     "rotation": "0|0|0",
     "revolve": 0,
@@ -2617,7 +2617,7 @@
       "key": "atlas_33001",
       "text": ""
     },
-    "enteranivalue": 30,
+    "enteranivalue": 0,
     "camerainterval": 0,
     "equiprcom": [
       1,

bin/json/game_item.json

@@ -8204,7 +8204,7 @@
       "text": "精炼石"
     },
     "usetype": 2,
-    "color": 5,
+    "color": 2,
     "bagtype": 3,
     "index": 120101,
     "special_type": 0,
@@ -8300,7 +8300,7 @@
       "text": "熔岩石"
     },
     "usetype": 2,
-    "color": 2,
+    "color": 4,
     "bagtype": 3,
     "index": 120103,
     "special_type": 0,
@@ -8396,7 +8396,7 @@
       "text": "星耀石"
     },
     "usetype": 2,
-    "color": 5,
+    "color": 3,
     "bagtype": 3,
     "index": 1,
     "special_type": 0,

bin/json/game_newsmithy.json

@@ -10,11 +10,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_1",
-      "text": "完美惩戒一阶图纸"
+      "text": "完美攻击一阶图纸"
     },
     "star": 1,
     "drawing_png": "tj_gjtz1_1",
-    "basic_drop": 13011001,
+    "basic_drop": 11001,
     "basic_cos": [
       {
         "a": "item",
@@ -48,11 +48,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_2",
-      "text": "完美惩戒二阶图纸"
+      "text": "完美攻击二阶图纸"
     },
     "star": 2,
     "drawing_png": "tj_gjtz1_2",
-    "basic_drop": 13011002,
+    "basic_drop": 11002,
     "basic_cos": [
       {
         "a": "item",
@@ -87,11 +87,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_3",
-      "text": "完美惩戒三阶图纸"
+      "text": "完美攻击三阶图纸"
     },
     "star": 2,
     "drawing_png": "tj_gjtz1_2",
-    "basic_drop": 13011003,
+    "basic_drop": 11003,
     "basic_cos": [
       {
         "a": "item",
@@ -125,11 +125,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_4",
-      "text": "史诗惩戒一阶图纸"
+      "text": "史诗攻击一阶图纸"
     },
     "star": 3,
     "drawing_png": "tj_gjtz1_3",
-    "basic_drop": 13011004,
+    "basic_drop": 11004,
     "basic_cos": [
       {
         "a": "item",
@@ -176,11 +176,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_5",
-      "text": "史诗惩戒二阶图纸"
+      "text": "史诗攻击二阶图纸"
     },
     "star": 3,
     "drawing_png": "tj_gjtz1_3",
-    "basic_drop": 13011005,
+    "basic_drop": 11005,
     "basic_cos": [
       {
         "a": "item",
@@ -226,11 +226,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_6",
-      "text": "传说惩戒一阶图纸"
+      "text": "传说攻击一阶图纸"
     },
     "star": 4,
     "drawing_png": "tj_gjtz1_4",
-    "basic_drop": 13011006,
+    "basic_drop": 11006,
     "basic_cos": [
       {
         "a": "item",
@@ -277,11 +277,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_7",
-      "text": "传说惩戒二阶图纸"
+      "text": "传说攻击二阶图纸"
     },
     "star": 4,
     "drawing_png": "tj_gjtz1_4",
-    "basic_drop": 13011007,
+    "basic_drop": 11007,
     "basic_cos": [
       {
         "a": "item",
@@ -327,11 +327,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_8",
-      "text": "完美惩戒一阶图纸"
+      "text": "完美攻击一阶图纸"
     },
     "star": 4,
     "drawing_png": "tj_gjtz1_4",
-    "basic_drop": 13011008,
+    "basic_drop": 11008,
     "basic_cos": [
       {
         "a": "item",
@@ -384,11 +384,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_9",
-      "text": "闪耀惩戒二阶图纸"
+      "text": "闪耀攻击二阶图纸"
     },
     "star": 4,
     "drawing_png": "tj_gjtz1_4",
-    "basic_drop": 13011009,
+    "basic_drop": 11009,
     "basic_cos": [
       {
         "a": "item",
@@ -440,11 +440,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_10",
-      "text": "完美战斗一阶图纸"
+      "text": "完美防御一阶图纸"
     },
     "star": 1,
     "drawing_png": "tj_fytz_1_1",
-    "basic_drop": 13012001,
+    "basic_drop": 12001,
     "basic_cos": [
       {
         "a": "item",
@@ -478,11 +478,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_11",
-      "text": "完美战斗二阶图纸"
+      "text": "完美防御二阶图纸"
     },
     "star": 2,
     "drawing_png": "tj_fytz_1_2",
-    "basic_drop": 13012002,
+    "basic_drop": 12002,
     "basic_cos": [
       {
         "a": "item",
@@ -517,11 +517,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_12",
-      "text": "完美战斗三阶图纸"
+      "text": "完美防御三阶图纸"
     },
     "star": 2,
     "drawing_png": "tj_fytz_1_2",
-    "basic_drop": 13012003,
+    "basic_drop": 12003,
     "basic_cos": [
       {
         "a": "item",
@@ -555,11 +555,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_13",
-      "text": "史诗战斗一阶图纸"
+      "text": "史诗防御一阶图纸"
     },
     "star": 3,
     "drawing_png": "tj_fytz_1_3",
-    "basic_drop": 13012004,
+    "basic_drop": 12004,
     "basic_cos": [
       {
         "a": "item",
@@ -606,11 +606,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_14",
-      "text": "史诗战斗二阶图纸"
+      "text": "史诗防御二阶图纸"
     },
     "star": 3,
     "drawing_png": "tj_fytz_1_3",
-    "basic_drop": 13012005,
+    "basic_drop": 12005,
     "basic_cos": [
       {
         "a": "item",
@@ -656,11 +656,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_15",
-      "text": "传说战斗一阶图纸"
+      "text": "传说防御一阶图纸"
     },
     "star": 4,
     "drawing_png": "tj_fytz_1_4",
-    "basic_drop": 13012006,
+    "basic_drop": 12006,
     "basic_cos": [
       {
         "a": "item",
@@ -707,11 +707,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_16",
-      "text": "传说战斗二阶图纸"
+      "text": "传说防御二阶图纸"
     },
     "star": 4,
     "drawing_png": "tj_fytz_1_4",
-    "basic_drop": 13012007,
+    "basic_drop": 12007,
     "basic_cos": [
       {
         "a": "item",
@@ -757,11 +757,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_17",
-      "text": "完美战斗一阶图纸"
+      "text": "完美防御一阶图纸"
     },
     "star": 4,
     "drawing_png": "tj_fytz_1_4",
-    "basic_drop": 13012008,
+    "basic_drop": 12008,
     "basic_cos": [
       {
         "a": "item",
@@ -814,11 +814,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_18",
-      "text": "闪耀战斗二阶图纸"
+      "text": "闪耀防御二阶图纸"
     },
     "star": 4,
     "drawing_png": "tj_fytz_1_4",
-    "basic_drop": 13012009,
+    "basic_drop": 12009,
     "basic_cos": [
       {
         "a": "item",
@@ -870,11 +870,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_19",
-      "text": "完美全能一阶图纸"
+      "text": "完美辅助一阶图纸"
     },
     "star": 1,
     "drawing_png": "tj_fztz_1_1",
-    "basic_drop": 13013001,
+    "basic_drop": 13001,
     "basic_cos": [
       {
         "a": "item",
@@ -908,11 +908,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_20",
-      "text": "完美全能二阶图纸"
+      "text": "完美辅助二阶图纸"
     },
     "star": 2,
     "drawing_png": "tj_fztz_1_2",
-    "basic_drop": 13013002,
+    "basic_drop": 13002,
     "basic_cos": [
       {
         "a": "item",
@@ -947,11 +947,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_21",
-      "text": "完美全能三阶图纸"
+      "text": "完美辅助三阶图纸"
     },
     "star": 2,
     "drawing_png": "tj_fztz_1_2",
-    "basic_drop": 13013003,
+    "basic_drop": 13003,
     "basic_cos": [
       {
         "a": "item",
@@ -985,11 +985,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_22",
-      "text": "史诗全能一阶图纸"
+      "text": "史诗辅助一阶图纸"
     },
     "star": 3,
     "drawing_png": "tj_fztz_1_3",
-    "basic_drop": 13013004,
+    "basic_drop": 13004,
     "basic_cos": [
       {
         "a": "item",
@@ -1036,11 +1036,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_23",
-      "text": "史诗全能二阶图纸"
+      "text": "史诗辅助二阶图纸"
     },
     "star": 3,
     "drawing_png": "tj_fztz_1_3",
-    "basic_drop": 13013005,
+    "basic_drop": 13005,
     "basic_cos": [
       {
         "a": "item",
@@ -1086,11 +1086,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_24",
-      "text": "传说全能一阶图纸"
+      "text": "传说辅助一阶图纸"
     },
     "star": 4,
     "drawing_png": "tj_fztz_1_4",
-    "basic_drop": 13013006,
+    "basic_drop": 13006,
     "basic_cos": [
       {
         "a": "item",
@@ -1137,11 +1137,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_25",
-      "text": "传说全能二阶图纸"
+      "text": "传说辅助二阶图纸"
     },
     "star": 4,
     "drawing_png": "tj_fztz_1_4",
-    "basic_drop": 13013007,
+    "basic_drop": 13007,
     "basic_cos": [
       {
         "a": "item",
@@ -1187,11 +1187,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_26",
-      "text": "完美全能一阶图纸"
+      "text": "完美辅助一阶图纸"
     },
     "star": 4,
     "drawing_png": "tj_fztz_1_4",
-    "basic_drop": 13013008,
+    "basic_drop": 13008,
     "basic_cos": [
       {
         "a": "item",
@@ -1244,11 +1244,11 @@
     },
     "drawing_name": {
       "key": "newsmithy_make_drawing_name_27",
-      "text": "闪耀全能二阶图纸"
+      "text": "闪耀辅助二阶图纸"
     },
     "star": 4,
     "drawing_png": "tj_fztz_1_4",
-    "basic_drop": 13013009,
+    "basic_drop": 13009,
     "basic_cos": [
       {
         "a": "item",

bin/json/game_ruledesc.json

@@ -117,7 +117,7 @@
     },
     "content": {
       "key": "ruledesc_ruledesc_content_11",
-      "text": "属性约束关系<br>当时用有利属性惊喜攻击时，额外高处15%的概率触发暴击，额外50概率触发会心。<br>当时用不利属性进行攻击时，额外高处50%概率触发失手。"
+      "text": "反正克制就是最好的。"
     }
   },
   {
@@ -139,7 +139,7 @@
     },
     "content": {
       "key": "ruledesc_ruledesc_content_13",
-      "text": "这里可以挑战冒险之旅。<br>体验传承者在各个世界经历的传奇故事。"
+      "text": "这里可以挑战冒险之旅并赢取巨量奖励。"
     }
   },
   {
@@ -260,7 +260,7 @@
     },
     "content": {
       "key": "ruledesc_ruledesc_content_24",
-      "text": "这里可以查看关卡星完成条件。<br>积累一定的关卡星可以获得额外的道具奖励。"
+      "text": "这里可以查看关卡星完成条件，积累一定的关卡星可以获得额外的道具奖励。"
     }
   },
   {
@@ -304,7 +304,7 @@
     },
     "content": {
       "key": "ruledesc_ruledesc_content_28",
-      "text": "这里可以消耗锻造材料打造出各种装备。<br>打造增长熟练度，熟练度足够后会解锁下一级图纸。<br>打造越高级的图纸获得更好的装备概率越高。"
+      "text": "这里可以消耗锻造材料打造出各种装备，打造增长熟练度，熟练度足够后会解锁下一级图纸，打造越高级的图纸获得更好的装备概率越高。"
     }
   },
   {
@@ -315,7 +315,7 @@
     },
     "content": {
       "key": "ruledesc_ruledesc_content_29",
-      "text": "这里可以查看炉温。<br>炉温是打造时的消耗品，随时间自动回复，也可以使用道具回复。<br>提升炉温等级可以提升炉温上限与炉温恢复速度。"
+      "text": "这里可以查看炉温，炉温是打造时的消耗品，随时间自动回复，也可以使用道具回复。<br>提升炉温等级可以提升炉温上限与炉温恢复速度。"
     }
   },
   {
@@ -381,7 +381,7 @@
     },
     "content": {
       "key": "ruledesc_ruledesc_content_35",
-      "text": "这里可以登记不同职业类别。<br>登记类别提升后，该类别的守护者可以获得额外的木桩锻炼经验加成。"
+      "text": "这里可以登记不同职业类别，登记类别提升后，该类别的守护者可以获得额外的木桩锻炼经验加成。"
     }
   },
   {
@@ -414,7 +414,7 @@
     },
     "content": {
       "key": "ruledesc_ruledesc_content_38",
-      "text": "这里可以使用虚拟货币购买不同城市的货物。<br>在需求不同的城市中卖出来赚取更多的虚拟币，最后会根据玩家虚拟币的排名获取奖励。"
+      "text": "这里可以使用虚拟货币购买不同城市的货物，在需求不同的城市中卖出来赚取更多的虚拟币，最后会根据玩家虚拟币的排名获取奖励。"
     }
   },
   {
@@ -491,7 +491,7 @@
     },
     "content": {
       "key": "ruledesc_ruledesc_content_45",
-      "text": "这里可以使用食材烹饪出各种各样的食物。<br>食材组合的不同，烹饪出来的食物也完全不同。<br>添加的食物越多，能煮出好食物的概率越高。<br>只有正确的食材组合才能烹饪出美味佳肴。"
+      "text": "这里可以使用食材烹饪出各种各样的食物。<br>食材组合的不同，烹饪出来的食物也完全不同。<br>添加的食物越多，能煮出好食物的概率越高，但要小心错误的食材组合会完全烹饪不出好的食物。只有正确的食材组合才能烹饪出美味佳肴。"
     }
   },
   {

bin/json/game_shop.json

@@ -54,8 +54,7 @@
       11003,
       11004,
       11005,
-      11006,
+      11006
-      11007
     ]
   },
   {

bin/json/game_shopitem.json

@@ -24085,42 +24085,6 @@
   },
   {
     "key": 686,
-    "id": 11007,
-    "iteminfo": [
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 1
-      }
-    ],
-    "preview": false,
-    "probability": 1000,
-    "need": [
-      {
-        "a": "attr",
-        "t": "guildcoin",
-        "n": 50
-      }
-    ],
-    "sale": 1000,
-    "salelist": [
-      1000,
-      1000,
-      1000,
-      1000,
-      1000,
-      1000
-    ],
-    "buyminnum": 10,
-    "buymaxnum": 10,
-    "vip": 0,
-    "lvmin": 1,
-    "lvmax": 60,
-    "mapidmin": 101,
-    "mapidmax": 9999
-  },
-  {
-    "key": 687,
     "id": 12001,
     "iteminfo": [
       {
@@ -24156,7 +24120,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 688,
+    "key": 687,
     "id": 12002,
     "iteminfo": [
       {
@@ -24192,7 +24156,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 689,
+    "key": 688,
     "id": 12003,
     "iteminfo": [
       {
@@ -24228,7 +24192,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 690,
+    "key": 689,
     "id": 12004,
     "iteminfo": [
       {
@@ -24264,7 +24228,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 691,
+    "key": 690,
     "id": 12005,
     "iteminfo": [
       {
@@ -24300,7 +24264,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 692,
+    "key": 691,
     "id": 12006,
     "iteminfo": [
       {
@@ -24336,7 +24300,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 693,
+    "key": 692,
     "id": 14001,
     "iteminfo": [
       {
@@ -24372,7 +24336,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 694,
+    "key": 693,
     "id": 14002,
     "iteminfo": [
       {
@@ -24408,7 +24372,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 695,
+    "key": 694,
     "id": 14003,
     "iteminfo": [
       {
@@ -24444,7 +24408,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 696,
+    "key": 695,
     "id": 14004,
     "iteminfo": [
       {
@@ -24480,7 +24444,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 697,
+    "key": 696,
     "id": 14005,
     "iteminfo": [
       {
@@ -24516,7 +24480,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 698,
+    "key": 697,
     "id": 14006,
     "iteminfo": [
       {
@@ -24552,7 +24516,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 699,
+    "key": 698,
     "id": 14007,
     "iteminfo": [
       {
@@ -24588,7 +24552,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 700,
+    "key": 699,
     "id": 14008,
     "iteminfo": [
       {
@@ -24624,7 +24588,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 701,
+    "key": 700,
     "id": 15001,
     "iteminfo": [
       {
@@ -24660,7 +24624,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 702,
+    "key": 701,
     "id": 15001,
     "iteminfo": [
       {
@@ -24696,7 +24660,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 703,
+    "key": 702,
     "id": 15001,
     "iteminfo": [
       {
@@ -24732,7 +24696,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 704,
+    "key": 703,
     "id": 15002,
     "iteminfo": [
       {
@@ -24768,7 +24732,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 705,
+    "key": 704,
     "id": 15003,
     "iteminfo": [
       {
@@ -24804,7 +24768,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 706,
+    "key": 705,
     "id": 15004,
     "iteminfo": [
       {
@@ -24840,7 +24804,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 707,
+    "key": 706,
     "id": 15005,
     "iteminfo": [
       {
@@ -24876,7 +24840,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 708,
+    "key": 707,
     "id": 15006,
     "iteminfo": [
       {
@@ -24912,7 +24876,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 709,
+    "key": 708,
     "id": 15007,
     "iteminfo": [
       {
@@ -24948,7 +24912,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 710,
+    "key": 709,
     "id": 15008,
     "iteminfo": [
       {
@@ -24984,7 +24948,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 711,
+    "key": 710,
     "id": 15009,
     "iteminfo": [
       {
@@ -25020,7 +24984,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 712,
+    "key": 711,
     "id": 13001,
     "iteminfo": [
       {
@@ -25056,7 +25020,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 713,
+    "key": 712,
     "id": 13002,
     "iteminfo": [
       {
@@ -25092,7 +25056,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 714,
+    "key": 713,
     "id": 13003,
     "iteminfo": [
       {
@@ -25128,7 +25092,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 715,
+    "key": 714,
     "id": 13004,
     "iteminfo": [
       {
@@ -25164,7 +25128,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 716,
+    "key": 715,
     "id": 13005,
     "iteminfo": [
       {
@@ -25200,7 +25164,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 717,
+    "key": 716,
     "id": 13006,
     "iteminfo": [
       {
@@ -25236,7 +25200,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 718,
+    "key": 717,
     "id": 13007,
     "iteminfo": [
       {
@@ -25272,7 +25236,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 719,
+    "key": 718,
     "id": 13008,
     "iteminfo": [
       {

bin/json/game_skillafteratk.json

@@ -13850,7 +13850,7 @@
     "Type": 3,
     "Argu": [
       390001101,
-      400,
+      1000,
       1,
       2
     ],
@@ -13898,10 +13898,10 @@
     "Argu": [
       1,
       4,
-      6000,
+      1000,
       2,
       2,
-      500
+      50
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -13924,7 +13924,7 @@
     "Argu": [
       1,
       4,
-      1650
+      1550
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -13949,7 +13949,7 @@
     "Argu": [
       1,
       4,
-      1800
+      1600
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -13974,7 +13974,7 @@
     "Argu": [
       1,
       4,
-      1950
+      1650
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -13999,7 +13999,7 @@
     "Argu": [
       1,
       4,
-      2100
+      1700
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -14024,7 +14024,7 @@
     "Argu": [
       1,
       4,
-      3000
+      2000
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -14096,7 +14096,7 @@
     "Argu": [
       1,
       4,
-      3000
+      1800
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -14145,7 +14145,7 @@
     "Argu": [
       1,
       4,
-      3200
+      2100
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -14170,7 +14170,7 @@
     "Argu": [
       1,
       4,
-      3400
+      2200
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -14195,7 +14195,7 @@
     "Argu": [
       1,
       4,
-      3600
+      2300
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -14220,7 +14220,7 @@
     "Argu": [
       1,
       4,
-      3800
+      2400
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -14272,9 +14272,7 @@
       1400
     ],
     "FollowSK": [],
-    "SucFollowSK": [
+    "SucFollowSK": [],
-      224008313
-    ],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -14318,12 +14316,10 @@
     "Argu": [
       1,
       4,
-      1500
+      1450
     ],
     "FollowSK": [],
-    "SucFollowSK": [
+    "SucFollowSK": [],
-      224008313
-    ],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -14343,12 +14339,10 @@
     "Argu": [
       1,
       4,
-      1600
+      1500
     ],
     "FollowSK": [],
-    "SucFollowSK": [
+    "SucFollowSK": [],
-      224008313
-    ],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -14368,12 +14362,10 @@
     "Argu": [
       1,
       4,
-      1700
+      1550
     ],
     "FollowSK": [],
-    "SucFollowSK": [
+    "SucFollowSK": [],
-      224008313
-    ],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -14393,12 +14385,10 @@
     "Argu": [
       1,
       4,
-      1850
+      1600
     ],
     "FollowSK": [],
-    "SucFollowSK": [
+    "SucFollowSK": [],
-      224008313
-    ],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -14479,7 +14469,7 @@
   {
     "Id": 234008113,
     "EmitPR": 1000,
-    "From": 3,
+    "From": 1,
     "Where": [],
     "Order": "",
     "Limit": 1,
@@ -14506,7 +14496,7 @@
     "Where": [],
     "Order": "Type=Rand",
     "Limit": 2,
-    "ExecuteCnt": 1,
+    "ExecuteCnt": 2,
     "Type": 1,
     "Argu": [
       1,
@@ -15214,7 +15204,9 @@
       2
     ],
     "FollowSK": [],
-    "SucFollowSK": [],
+    "SucFollowSK": [
+      224004212
+    ],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -17276,11 +17268,10 @@
       -1,
       1000
     ],
-    "FollowSK": [
+    "FollowSK": [],
-      224005212,
+    "SucFollowSK": [
-      224005213
+      224005212
     ],
-    "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -17312,50 +17303,6 @@
     "RevisiCondition": "",
     "RevisiParams": []
   },
-  {
-    "Id": 224005213,
-    "EmitPR": 1000,
-    "From": 4,
-    "Where": [],
-    "Order": "",
-    "Limit": 10,
-    "ExecuteCnt": 1,
-    "Type": 2,
-    "Argu": [
-      424005211,
-      2,
-      -1
-    ],
-    "FollowSK": [],
-    "SucFollowSK": [],
-    "FailFollowSK": [],
-    "MustHit": false,
-    "DpsRevisiType": 0,
-    "DpsCondition": "",
-    "RevisiCondition": "",
-    "RevisiParams": []
-  },
-  {
-    "Id": 224005214,
-    "EmitPR": 1000,
-    "From": 8,
-    "Where": [],
-    "Order": "",
-    "Limit": 10,
-    "ExecuteCnt": 1,
-    "Type": 12,
-    "Argu": [
-      150
-    ],
-    "FollowSK": [],
-    "SucFollowSK": [],
-    "FailFollowSK": [],
-    "MustHit": false,
-    "DpsRevisiType": 0,
-    "DpsCondition": "",
-    "RevisiCondition": "",
-    "RevisiParams": []
-  },
   {
     "Id": 224005221,
     "EmitPR": 1000,
@@ -17370,11 +17317,10 @@
       -1,
       1000
     ],
-    "FollowSK": [
+    "FollowSK": [],
-      224005222,
+    "SucFollowSK": [
-      224005213
+      224005222
     ],
-    "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -17420,11 +17366,10 @@
       -1,
       1000
     ],
-    "FollowSK": [
+    "FollowSK": [],
-      224005232,
+    "SucFollowSK": [
-      224005213
+      224005232
     ],
-    "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -57058,12 +57003,8 @@
     "Order": "",
     "Limit": 10,
     "ExecuteCnt": 1,
-    "Type": 8,
+    "Type": 29,
-    "Argu": [
+    "Argu": [],
-      1,
-      -1,
-      1000
-    ],
     "FollowSK": [],
     "SucFollowSK": [],
     "FailFollowSK": [],
@@ -60052,7 +59993,7 @@
     "Type": 2,
     "Argu": [
       494300331,
-      1,
+      -1,
       -1
     ],
     "FollowSK": [],
@@ -60083,30 +60024,6 @@
     "RevisiCondition": "",
     "RevisiParams": []
   },
-  {
-    "Id": 943003315,
-    "EmitPR": 1000,
-    "From": 9,
-    "Where": [],
-    "Order": "",
-    "Limit": 10,
-    "ExecuteCnt": 1,
-    "Type": 3,
-    "Argu": [
-      390001127,
-      1000,
-      1,
-      -1
-    ],
-    "FollowSK": [],
-    "SucFollowSK": [],
-    "FailFollowSK": [],
-    "MustHit": false,
-    "DpsRevisiType": 0,
-    "DpsCondition": "",
-    "RevisiCondition": "",
-    "RevisiParams": []
-  },
   {
     "Id": 915002311,
     "EmitPR": 1000,
@@ -61146,12 +61063,35 @@
     "Order": "",
     "Limit": 10,
     "ExecuteCnt": 1,
+    "Type": 2,
+    "Argu": [
+      494400131,
+      -1,
+      -1
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 944001314,
+    "EmitPR": 1000,
+    "From": 3,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
     "Type": 3,
     "Argu": [
-      391000076,
+      391000008,
       1000,
       1,
-      -1
+      1
     ],
     "FollowSK": [],
     "SucFollowSK": [],

bin/json/game_skillatk.json

@@ -5526,9 +5526,12 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_124002311_1",
-      "text": "攻击全体敌方3次，共造成攻击力450%伤害。"
+      "text": "攻击全体敌方3次，共造成攻击力450%伤害。并为目标附加[color=#e5621b]小牙仙的围攻[/color] 状态。"
     },
-    "buffid": [],
+    "buffid": [
+      390001211,
+      390001008
+    ],
     "map": ""
   },
   {
@@ -9359,7 +9362,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_114001211_1",
-      "text": "史图依克每次受到攻击时，获得1层[color=#37d8a9]酋长之怒[/color]，最多可叠加10层。自身获得10层[color=#37d8a9]酋长之怒[/color]时将立即获得回合。"
+      "text": "史图依克每次受到攻击时，获得1层[color=#37d8a9]酋长之怒[/color]，每层可提升自身10%的基础防御力和5%的效果抵抗，最多可叠加10层。"
     },
     "buffid": [
       390001202
@@ -9595,12 +9598,11 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        224008111
+        224008111,
+        224008113
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      224008113
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_124008111_1",
       "text": "暴芙那特对敌方1个目标造成2次自身攻击力150%的伤害，并有40%概率附加2回合[color=#e5621b]童年阴影[/color]效果。某悍夫那特在场，则本次攻击额外附加目标最大生命值5%的伤害，但最高无法超过自身攻击力的60%。"
@@ -9629,12 +9631,11 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        224008121
+        224008121,
+        224008113
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      224008113
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_124008111_2",
       "text": "伤害提升至165%。"
@@ -9663,12 +9664,11 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        224008131
+        224008131,
+        224008113
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      224008113
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_124008111_3",
       "text": "伤害提升至180%。"
@@ -9697,12 +9697,11 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        224008141
+        224008141,
+        224008113
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      224008113
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_124008111_4",
       "text": "伤害提升至195%。"
@@ -9731,12 +9730,11 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        224008151
+        224008151,
+        224008113
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      224008113
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_124008111_5",
       "text": "伤害提升至210%。"
@@ -9765,12 +9763,11 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        224008211
+        224008211,
+        224008213
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      224008213
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_124008211_1",
       "text": "暴芙那特对敌方全体造成1次自身攻击力300%的伤害，并有40%概率附加2回合[color=#e5621b]速度下降[/color]效果。若悍夫那特在场，则本次攻击额外造成伤害。"
@@ -9799,12 +9796,11 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        224008221
+        224008221,
+        224008213
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      224008213
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_124008211_2",
       "text": "伤害提升至320%。"
@@ -9833,12 +9829,11 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        224008231
+        224008231,
+        224008213
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      224008213
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_124008211_3",
       "text": "伤害提升至340%。"
@@ -9867,12 +9862,11 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        224008241
+        224008241,
+        224008213
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      224008213
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_124008211_4",
       "text": "伤害提升至360%。"
@@ -9901,12 +9895,11 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        224008251
+        224008251,
+        224008213
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      224008213
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_124008211_5",
       "text": "伤害提升至380%。"
@@ -9936,7 +9929,8 @@
     "ChildSkill": {
       "Id": [
         224008311,
-        224008312
+        224008312,
+        224008313
       ]
     },
     "passSkill": [],
@@ -9970,7 +9964,8 @@
     "ChildSkill": {
       "Id": [
         224008311,
-        224008322
+        224008322,
+        224008313
       ]
     },
     "passSkill": [],
@@ -10004,7 +9999,8 @@
     "ChildSkill": {
       "Id": [
         224008311,
-        224008332
+        224008332,
+        224008313
       ]
     },
     "passSkill": [],
@@ -10038,7 +10034,8 @@
     "ChildSkill": {
       "Id": [
         224008311,
-        224008342
+        224008342,
+        224008313
       ]
     },
     "passSkill": [],
@@ -10072,7 +10069,8 @@
     "ChildSkill": {
       "Id": [
         224008311,
-        224008352
+        224008352,
+        224008313
       ]
     },
     "passSkill": [],
@@ -10630,12 +10628,11 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        224004111
+        224004111,
+        224004112
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      224004112
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_124004111_1",
       "text": "对敌方1个目标造成攻击力300%的伤害；若发生暴击，致命回旋冷却时间减少1回合。"
@@ -10662,12 +10659,11 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        224004121
+        224004121,
+        224004112
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      224004112
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_124004111_2",
       "text": "每次伤害提升至325%。"
@@ -10694,12 +10690,11 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        224004131
+        224004131,
+        224004112
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      224004112
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_124004111_3",
       "text": "每次伤害提升至350%。"
@@ -10726,12 +10721,11 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        224004141
+        224004141,
+        224004112
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      224004112
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_124004111_4",
       "text": "每次伤害提升至375%。"
@@ -10758,12 +10752,11 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        224004151
+        224004151,
+        224004112
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      224004112
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_124004111_5",
       "text": "每次伤害提升至400%。"
@@ -10889,13 +10882,12 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
+        224004311,
+        224004312,
         224004313
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      224004311,
-      224004312
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_124004311_1",
       "text": "对敌方目标造成攻击力500%的伤害；若目标死亡，则附加1次攻击，对随机1个目标造成攻击力350%的伤害，本次攻击无视防御。"
@@ -10922,13 +10914,12 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
+        224004311,
+        224004312,
         224004323
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      224004311,
-      224004312
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_124004311_2",
       "text": "伤害提升至530%。"
@@ -10955,13 +10946,12 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
+        224004311,
+        224004312,
         224004333
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      224004311,
-      224004312
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_124004311_3",
       "text": "伤害提升至560%。"
@@ -10988,13 +10978,12 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
+        224004311,
+        224004312,
         224004343
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      224004311,
-      224004312
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_124004311_4",
       "text": "伤害提升至590%。"
@@ -11021,13 +11010,12 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
+        224004311,
+        224004312,
         224004353
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      224004311,
-      224004312
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_124004311_5",
       "text": "伤害提升至630%。"
@@ -18149,7 +18137,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_143003311_1",
-      "text": "史蒂夫·帕丘克为己方1个目标恢复其最大生命值20%的生命，若目标队友处于死亡状态，则将其复活并恢复其最大生命值20%的生命。"
+      "text": "史蒂夫·帕丘克为己方1个目标恢复其最大生命值20%的生命，若目标队友处于死亡状态，则将其复活并恢复其最大生命值20%的生命，随后自身获得额外回合。"
     },
     "buffid": [],
     "map": ""
@@ -44771,7 +44759,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_943003433_1",
-      "text": "3技能复活目标后，自身获得额外回合，并为目标添加2回合【复苏】。"
+      "text": "3技能复活目标后，自身获得额外回合。"
     },
     "buffid": [],
     "map": ""
@@ -45131,7 +45119,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_944001433_1",
-      "text": "攻击生命值小于50%的目标伤害增加30%"
+      "text": "攻击生命值大于50%的目标伤害增加30%"
     },
     "buffid": [],
     "map": ""
@@ -45672,7 +45660,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_944006433_1",
-      "text": "自身造成击杀时，移除自身所有减益"
+      "text": "自身造成击杀时，将获得额外回合"
     },
     "buffid": [],
     "map": ""

bin/json/game_skillbuff.json

@@ -349,7 +349,6 @@
     },
     "BuffType": 33,
     "EffectArgu": [
-      0,
       100
     ],
     "BufParNum": 1,
@@ -382,7 +381,6 @@
     },
     "BuffType": 33,
     "EffectArgu": [
-      0,
       150
     ],
     "BufParNum": 1,
@@ -415,7 +413,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      13
+      13,
+      150
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -448,7 +447,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      11
+      11,
+      500
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -760,6 +760,7 @@
     "BuffType": 31,
     "EffectArgu": [
       1,
+      4,
       1000
     ],
     "BufParNum": 1,
@@ -1068,6 +1069,7 @@
     "BuffType": 31,
     "EffectArgu": [
       1,
+      2,
       100
     ],
     "BufParNum": 1,
@@ -1102,6 +1104,7 @@
     "BuffType": 31,
     "EffectArgu": [
       1,
+      2,
       50
     ],
     "BufParNum": 1,
@@ -1165,6 +1168,7 @@
     },
     "BuffType": 31,
     "EffectArgu": [
+      2,
       2,
       500
     ],
@@ -1230,6 +1234,7 @@
     "BuffType": 49,
     "EffectArgu": [
       1,
+      2,
       150
     ],
     "BufParNum": 1,
@@ -1293,6 +1298,7 @@
     "BuffType": 31,
     "EffectArgu": [
       1,
+      2,
       350
     ],
     "BufParNum": 1,
@@ -1327,6 +1333,7 @@
     "BuffType": 31,
     "EffectArgu": [
       1,
+      2,
       500
     ],
     "BufParNum": 1,
@@ -1360,7 +1367,8 @@
     },
     "BuffType": 0,
     "EffectArgu": [
-      22
+      22,
+      50
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -1394,6 +1402,7 @@
     "BuffType": 48,
     "EffectArgu": [
       60,
+      100,
       36,
       50
     ],
@@ -1459,7 +1468,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      22
+      22,
+      140
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -1554,7 +1564,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      13
+      13,
+      250
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -1618,7 +1629,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      23
+      23,
+      20
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -1652,6 +1664,7 @@
     "BuffType": 71,
     "EffectArgu": [
       2,
+      224002214,
       224002215
     ],
     "BufParNum": 1,
@@ -1684,7 +1697,8 @@
     },
     "BuffType": 47,
     "EffectArgu": [
-      50
+      50,
+      30
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -1777,8 +1791,11 @@
       "key": "skill_skill_buff_Desc_390001215",
       "text": "无法被附加减益，任意友方行动结束后，状态携带者行动值提升15%。"
     },
-    "BuffType": 30,
+    "BuffType": 20,
-    "EffectArgu": [],
+    "EffectArgu": [
+      17,
+      150
+    ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
     "CoexistCheckArgu": [],
@@ -1875,7 +1892,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      22
+      22,
+      70
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -1907,7 +1925,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      54
+      54,
+      200
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -1939,7 +1958,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      57
+      57,
+      200
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -1971,7 +1991,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      60
+      60,
+      200
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2003,7 +2024,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      63
+      63,
+      200
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2035,7 +2057,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      70
+      70,
+      150
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2067,7 +2090,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      73
+      73,
+      200
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2099,7 +2123,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      76
+      76,
+      200
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2131,7 +2156,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      54
+      54,
+      240
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2163,7 +2189,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      57
+      57,
+      250
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2195,7 +2222,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      60
+      60,
+      250
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2227,7 +2255,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      63
+      63,
+      200
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2259,7 +2288,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      70
+      70,
+      200
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2291,7 +2321,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      73
+      73,
+      300
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2323,7 +2354,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      76
+      76,
+      300
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2355,7 +2387,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      54
+      54,
+      300
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2387,7 +2420,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      57
+      57,
+      300
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2419,7 +2453,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      60
+      60,
+      300
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2451,7 +2486,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      63
+      63,
+      250
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2483,7 +2519,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      70
+      70,
+      300
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2515,7 +2552,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      73
+      73,
+      400
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2547,7 +2585,8 @@
     },
     "BuffType": 0,
     "EffectArgu": [
-      76
+      76,
+      500
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2579,7 +2618,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      60
+      60,
+      400
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2611,7 +2651,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      60
+      60,
+      240
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2643,7 +2684,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      60
+      60,
+      180
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2675,7 +2717,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      57
+      57,
+      400
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2707,7 +2750,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      57
+      57,
+      240
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2739,7 +2783,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      57
+      57,
+      180
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2772,6 +2817,7 @@
     "BuffType": 34,
     "EffectArgu": [
       1,
+      2,
       40
     ],
     "BufParNum": 1,
@@ -2840,6 +2886,7 @@
     "BuffType": 102,
     "EffectArgu": [
       5,
+      10,
       400
     ],
     "BufParNum": 1,
@@ -2873,6 +2920,7 @@
     "BuffType": 75,
     "EffectArgu": [
       2,
+      4,
       500
     ],
     "BufParNum": 1,
@@ -2906,7 +2954,8 @@
     },
     "BuffType": 43,
     "EffectArgu": [
-      100
+      100,
+      60
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2938,7 +2987,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      21
+      21,
+      -250
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2971,7 +3021,6 @@
     },
     "BuffType": 33,
     "EffectArgu": [
-      0,
       500
     ],
     "BufParNum": 1,
@@ -3004,7 +3053,8 @@
     },
     "BuffType": 43,
     "EffectArgu": [
-      100
+      100,
+      50
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -3068,7 +3118,6 @@
     },
     "BuffType": 33,
     "EffectArgu": [
-      0,
       1000
     ],
     "BufParNum": 1,
@@ -3101,7 +3150,6 @@
     },
     "BuffType": 33,
     "EffectArgu": [
-      0,
       200
     ],
     "BufParNum": 1,
@@ -3196,7 +3244,6 @@
     },
     "BuffType": 33,
     "EffectArgu": [
-      0,
       1000
     ],
     "BufParNum": 1,
@@ -3293,7 +3340,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      2
+      2,
+      200
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -3358,6 +3406,7 @@
     },
     "BuffType": 31,
     "EffectArgu": [
+      1,
       1,
       150
     ],
@@ -3454,7 +3503,6 @@
     },
     "BuffType": 33,
     "EffectArgu": [
-      0,
       100
     ],
     "BufParNum": 1,
@@ -3518,7 +3566,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      21
+      21,
+      -300
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -3616,6 +3665,7 @@
     },
     "BuffType": 55,
     "EffectArgu": [
+      100,
       100
     ],
     "BufParNum": 1,
@@ -3679,6 +3729,7 @@
     "BuffType": 75,
     "EffectArgu": [
       2,
+      4,
       500
     ],
     "BufParNum": 1,
@@ -3810,6 +3861,7 @@
     "BuffType": 31,
     "EffectArgu": [
       1,
+      2,
       220
     ],
     "BufParNum": 1,
@@ -3843,7 +3895,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      32
+      32,
+      30
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -3875,7 +3928,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      13
+      13,
+      500
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -3907,7 +3961,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      22
+      22,
+      20
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -3939,7 +3994,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      23
+      23,
+      20
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -3971,7 +4027,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      33
+      33,
+      20
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -4033,7 +4090,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      35
+      35,
+      20
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -4066,7 +4124,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      36
+      36,
+      20
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -4099,7 +4158,8 @@
     },
     "BuffType": 60,
     "EffectArgu": [
-      1
+      1,
+      100
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -4131,7 +4191,8 @@
     },
     "BuffType": 57,
     "EffectArgu": [
-      24
+      24,
+      1000
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -4195,7 +4256,6 @@
     },
     "BuffType": 33,
     "EffectArgu": [
-      0,
       50
     ],
     "BufParNum": 1,
@@ -10847,39 +10907,5 @@
     "buffeffect": "",
     "buffpos": "根节点",
     "forbidFloat": 0
-  },
-  {
-    "Id": 391000076,
-    "Name": {
-      "key": "skill_skill_buff_Name_391000000",
-      "text": "造成伤害提升30%"
-    },
-    "Desc": {
-      "key": "skill_skill_buff_Desc_391000000",
-      "text": "3技能最终伤害增加10%"
-    },
-    "BuffType": 33,
-    "EffectArgu": [
-      3,
-      300,
-      500
-    ],
-    "BufParNum": 1,
-    "RelyCheckArgu": [],
-    "CoexistCheckArgu": [],
-    "Effect": [
-      3
-    ],
-    "AddEffect": false,
-    "RemoveType": false,
-    "Priority": 0,
-    "NotOverlay": 0,
-    "OverlayTimes": 1,
-    "SameID": true,
-    "golbalbufficon": "",
-    "buffIcon": "",
-    "buffeffect": "",
-    "buffpos": "根节点",
-    "forbidFloat": 0
   }
 ]

bin/json/game_skillpassive.json

@@ -1355,26 +1355,6 @@
       243006215
     ]
   },
-  {
-    "Id": 424005211,
-    "When": 2,
-    "FromCheck": "Target=1",
-    "TargetCheck": "",
-    "MainSkillCheck": "",
-    "AfterSkillCheck": "",
-    "BuffCheck": "",
-    "DpsCheck": "",
-    "AddCon": [],
-    "PasPr": 1000,
-    "PasCorrection": 0,
-    "Type": "CallSkillPas",
-    "MaxEmitTimesInRoundByRole": 0,
-    "MaxEmitTimes": 0,
-    "MaxEmitTimesInRound": 1,
-    "Callback": [
-      224005214
-    ]
-  },
   {
     "Id": 413001211,
     "When": 16,
@@ -3388,7 +3368,7 @@
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
-    "MaxEmitTimesInRound": 10,
+    "MaxEmitTimesInRound": 1,
     "Callback": [
       224008114
     ]
@@ -3410,7 +3390,7 @@
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
-    "MaxEmitTimesInRound": 10,
+    "MaxEmitTimesInRound": 1,
     "Callback": [
       224008214
     ]
@@ -7865,8 +7845,7 @@
     "MaxEmitTimes": 0,
     "MaxEmitTimesInRound": 0,
     "Callback": [
-      943003314,
+      943003314
-      943003315
     ]
   },
   {
@@ -7913,7 +7892,7 @@
     "Id": 494400531,
     "When": 28,
     "FromCheck": "Target=3",
-    "TargetCheck": "Target=2",
+    "TargetCheck": "Target=2,HasBuff=1",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",
     "BuffCheck": "Succ=1",
@@ -7926,14 +7905,14 @@
     "MaxEmitTimes": 0,
     "MaxEmitTimesInRound": 0,
     "Callback": [
-      944005315
+      955005315
     ]
   },
   {
     "Id": 494400532,
     "When": 29,
     "FromCheck": "Target=3",
-    "TargetCheck": "Target=2",
+    "TargetCheck": "Target=2,HasBuff=3",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",
     "BuffCheck": "Succ=1",
@@ -7946,7 +7925,7 @@
     "MaxEmitTimes": 0,
     "MaxEmitTimesInRound": 0,
     "Callback": [
-      944005315
+      955005315
     ]
   },
   {

bin/json/game_skillproperty.json

@@ -145,7 +145,7 @@
   {
     "ProType": 13,
     "ProLevel": 1,
-    "LimitValue": 0,
+    "LimitValue": 1,
     "MinValue": 0,
     "MaxValue": 0,
     "BaseTerms": 0,
@@ -156,7 +156,7 @@
   {
     "ProType": 14,
     "ProLevel": 1,
-    "LimitValue": 0,
+    "LimitValue": 1,
     "MinValue": 0,
     "MaxValue": 0,
     "BaseTerms": 0,

bin/json/game_vikingboss.json

@@ -21,11 +21,6 @@
         "t": "diamond",
         "n": 50
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000007",
@@ -84,11 +79,6 @@
         "a": "attr",
         "t": "diamond",
         "n": 50
-      },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
       }
     ],
     "dropshow": [
@@ -144,11 +134,6 @@
         "t": "diamond",
         "n": 100
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000007",
@@ -207,11 +192,6 @@
         "a": "attr",
         "t": "diamond",
         "n": 100
-      },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
       }
     ],
     "dropshow": [
@@ -267,11 +247,6 @@
         "t": "diamond",
         "n": 100
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000007",
@@ -330,11 +305,6 @@
         "a": "attr",
         "t": "diamond",
         "n": 100
-      },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
       }
     ],
     "dropshow": [
@@ -395,11 +365,6 @@
         "t": "10000001",
         "n": 1
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000007",
@@ -463,11 +428,6 @@
         "a": "item",
         "t": "10000001",
         "n": 1
-      },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
       }
     ],
     "dropshow": [
@@ -528,11 +488,6 @@
         "t": "10000001",
         "n": 1
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000007",
@@ -597,11 +552,6 @@
         "t": "10000001",
         "n": 1
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000008",
@@ -666,11 +616,6 @@
         "t": "10000001",
         "n": 1
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000008",
@@ -735,11 +680,6 @@
         "t": "10000001",
         "n": 1
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000008",
@@ -799,11 +739,6 @@
         "t": "diamond",
         "n": 50
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000007",
@@ -862,11 +797,6 @@
         "a": "attr",
         "t": "diamond",
         "n": 50
-      },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
       }
     ],
     "dropshow": [
@@ -922,11 +852,6 @@
         "t": "diamond",
         "n": 100
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000007",
@@ -985,11 +910,6 @@
         "a": "attr",
         "t": "diamond",
         "n": 100
-      },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
       }
     ],
     "dropshow": [
@@ -1045,11 +965,6 @@
         "t": "diamond",
         "n": 100
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000007",
@@ -1108,11 +1023,6 @@
         "a": "attr",
         "t": "diamond",
         "n": 100
-      },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
       }
     ],
     "dropshow": [
@@ -1173,11 +1083,6 @@
         "t": "10000001",
         "n": 1
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000007",
@@ -1241,11 +1146,6 @@
         "a": "item",
         "t": "10000001",
         "n": 1
-      },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
       }
     ],
     "dropshow": [
@@ -1306,11 +1206,6 @@
         "t": "10000001",
         "n": 1
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000007",
@@ -1375,11 +1270,6 @@
         "t": "10000001",
         "n": 1
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000008",
@@ -1444,11 +1334,6 @@
         "t": "10000001",
         "n": 1
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000008",
@@ -1513,11 +1398,6 @@
         "t": "10000001",
         "n": 1
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000008",
@@ -1576,11 +1456,6 @@
         "t": "diamond",
         "n": 50
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000007",
@@ -1638,11 +1513,6 @@
         "a": "attr",
         "t": "diamond",
         "n": 50
-      },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
       }
     ],
     "dropshow": [
@@ -1697,11 +1567,6 @@
         "t": "diamond",
         "n": 100
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000007",
@@ -1759,11 +1624,6 @@
         "a": "attr",
         "t": "diamond",
         "n": 100
-      },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
       }
     ],
     "dropshow": [
@@ -1818,11 +1678,6 @@
         "t": "diamond",
         "n": 100
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000007",
@@ -1880,11 +1735,6 @@
         "a": "attr",
         "t": "diamond",
         "n": 100
-      },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
       }
     ],
     "dropshow": [
@@ -1944,11 +1794,6 @@
         "t": "10000001",
         "n": 1
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000007",
@@ -2011,11 +1856,6 @@
         "a": "item",
         "t": "10000001",
         "n": 1
-      },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
       }
     ],
     "dropshow": [
@@ -2075,11 +1915,6 @@
         "t": "10000001",
         "n": 1
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000007",
@@ -2143,11 +1978,6 @@
         "t": "10000001",
         "n": 1
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000008",
@@ -2211,11 +2041,6 @@
         "t": "10000001",
         "n": 1
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000008",
@@ -2279,11 +2104,6 @@
         "t": "10000001",
         "n": 1
       },
-      {
-        "a": "item",
-        "t": "13000003",
-        "n": 5
-      },
       {
         "a": "item",
         "t": "13000008",