Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

bin/json/game_itinerant_lv.json

@@ -3,6 +3,7 @@
     "lv": 0,
     "newmoneyexp": 0,
     "bagtop": 20,
+    "bagtagnum": 40,
     "tickettop": {
       "a": "item",
       "t": "141002",
@@ -21,6 +22,7 @@
     "lv": 1,
     "newmoneyexp": 100000,
     "bagtop": 24,
+    "bagtagnum": 40,
     "tickettop": {
       "a": "item",
       "t": "141002",
@@ -45,6 +47,7 @@
     "lv": 2,
     "newmoneyexp": 200000,
     "bagtop": 28,
+    "bagtagnum": 40,
     "tickettop": {
       "a": "item",
       "t": "141002",
@@ -69,6 +72,7 @@
     "lv": 3,
     "newmoneyexp": 300000,
     "bagtop": 32,
+    "bagtagnum": 40,
     "tickettop": {
       "a": "item",
       "t": "141002",
@@ -93,6 +97,7 @@
     "lv": 4,
     "newmoneyexp": 400000,
     "bagtop": 36,
+    "bagtagnum": 40,
     "tickettop": {
       "a": "item",
       "t": "141002",
@@ -117,6 +122,7 @@
     "lv": 5,
     "newmoneyexp": 500000,
     "bagtop": 40,
+    "bagtagnum": 40,
     "tickettop": {
       "a": "item",
       "t": "141002",
@@ -141,6 +147,7 @@
     "lv": 6,
     "newmoneyexp": 600000,
     "bagtop": 44,
+    "bagtagnum": 40,
     "tickettop": {
       "a": "item",
       "t": "141002",
@@ -165,6 +172,7 @@
     "lv": 7,
     "newmoneyexp": 700000,
     "bagtop": 48,
+    "bagtagnum": 40,
     "tickettop": {
       "a": "item",
       "t": "141002",
@@ -189,6 +197,7 @@
     "lv": 8,
     "newmoneyexp": 800000,
     "bagtop": 52,
+    "bagtagnum": 40,
     "tickettop": {
       "a": "item",
       "t": "141002",
@@ -213,6 +222,7 @@
     "lv": 9,
     "newmoneyexp": 900000,
     "bagtop": 56,
+    "bagtagnum": 40,
     "tickettop": {
       "a": "item",
       "t": "141002",
@@ -237,6 +247,7 @@
     "lv": 10,
     "newmoneyexp": 1000000,
     "bagtop": 60,
+    "bagtagnum": 40,
     "tickettop": {
       "a": "item",
       "t": "141002",
@@ -261,6 +272,7 @@
     "lv": 11,
     "newmoneyexp": 1100000,
     "bagtop": 64,
+    "bagtagnum": 40,
     "tickettop": {
       "a": "item",
       "t": "141002",
@@ -285,6 +297,7 @@
     "lv": 12,
     "newmoneyexp": 1200000,
     "bagtop": 68,
+    "bagtagnum": 40,
     "tickettop": {
       "a": "item",
       "t": "141002",

bin/json/game_itinerant_reward.json

@@ -1,7 +1,8 @@
 [
   {
-    "num": 0,
+    "key": 1,
-    "type": 1,
+    "moneystart": 0,
+    "moneyend": 10000,
     "reward": [
       {
         "a": "attr",
@@ -11,8 +12,9 @@
     ]
   },
   {
-    "num": 10000,
+    "key": 2,
-    "type": 1,
+    "moneystart": 10000,
+    "moneyend": 20000,
     "reward": [
       {
         "a": "attr",
@@ -22,8 +24,9 @@
     ]
   },
   {
-    "num": 20000,
+    "key": 3,
-    "type": 1,
+    "moneystart": 20000,
+    "moneyend": 30000,
     "reward": [
       {
         "a": "attr",
@@ -33,8 +36,9 @@
     ]
   },
   {
-    "num": 30000,
+    "key": 4,
-    "type": 1,
+    "moneystart": 30000,
+    "moneyend": -1,
     "reward": [
       {
         "a": "attr",
@@ -44,8 +48,9 @@
     ]
   },
   {
-    "num": 1000,
+    "key": 5,
-    "type": 2,
+    "moneystart": 1000,
+    "moneyend": 0,
     "reward": [
       {
         "a": "attr",

bin/json/game_itinerant_thing.json

@@ -35,7 +35,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "id": 2,
@@ -73,7 +74,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "id": 3,
@@ -111,7 +113,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "id": 4,
@@ -149,7 +152,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "id": 5,
@@ -187,7 +191,8 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   },
   {
     "id": 6,
@@ -225,6 +230,7 @@
     ],
     "FluctuationRange": 500,
     "pricemin": 200,
-    "pricemax": 3000
+    "pricemax": 3000,
+    "goodsnum": 80
   }
 ]

bin/json/game_navigation.json

@@ -11,7 +11,9 @@
       "key": "navigation_functionname_2",
       "text": "商人"
     },
-    "npcName": "功能入口-商人",
+    "npcName": [
+      "功能入口-商人"
+    ],
     "functionicon": "icon_sd"
   },
   {
@@ -26,7 +28,9 @@
       "key": "navigation_functionname_4",
       "text": "公告"
     },
-    "npcName": "功能入口-公告",
+    "npcName": [
+      "功能入口-公告"
+    ],
     "functionicon": "icon_gg"
   },
   {
@@ -41,7 +45,9 @@
       "key": "navigation_functionname_5",
       "text": "邮件"
     },
-    "npcName": "功能入口-邮件",
+    "npcName": [
+      "功能入口-邮件"
+    ],
     "functionicon": "icon_yj"
   },
   {
@@ -56,7 +62,9 @@
       "key": "navigation_functionname_8",
       "text": "捕羊大赛"
     },
-    "npcName": "功能入口-捕羊大赛",
+    "npcName": [
+      "功能入口-捕羊大赛"
+    ],
     "functionicon": "ty_qp_by"
   },
   {
@@ -71,7 +79,9 @@
       "key": "navigation_functionname_13",
       "text": "签到"
     },
-    "npcName": "功能入口-签到",
+    "npcName": [
+      "功能入口-签到"
+    ],
     "functionicon": "icon_qd"
   },
   {
@@ -86,7 +96,9 @@
       "key": "navigation_functionname_14",
       "text": "魔药"
     },
-    "npcName": "功能入口-魔药",
+    "npcName": [
+      "功能入口-魔药"
+    ],
     "functionicon": "ty_qp_my"
   },
   {
@@ -101,7 +113,9 @@
       "key": "navigation_functionname_15",
       "text": "烹饪"
     },
-    "npcName": "功能入口-烹饪",
+    "npcName": [
+      "功能入口-烹饪"
+    ],
     "functionicon": "ty_qp_pr"
   },
   {
@@ -116,7 +130,9 @@
       "key": "navigation_functionname_26",
       "text": "指挥部"
     },
-    "npcName": "传送点-指挥部",
+    "npcName": [
+      "传送点-指挥部"
+    ],
     "functionicon": "ty_qp_zhb"
   },
   {
@@ -131,7 +147,9 @@
       "key": "navigation_functionname_27",
       "text": "竞技场"
     },
-    "npcName": "功能入口-竞技场",
+    "npcName": [
+      "功能入口-竞技场"
+    ],
     "functionicon": "ty_qp_jjc"
   },
   {
@@ -146,7 +164,10 @@
       "key": "navigation_functionname_28",
       "text": "工会"
     },
-    "npcName": "功能入口-工会申请",
+    "npcName": [
+      "功能入口-工会申请",
+      "传送点-公会"
+    ],
     "functionicon": "ty_qp_gh"
   },
   {
@@ -161,7 +182,9 @@
       "key": "navigation_functionname_16",
       "text": "打造"
     },
-    "npcName": "打造",
+    "npcName": [
+      "打造"
+    ],
     "functionicon": "ty_qp_zm"
   },
   {
@@ -176,7 +199,9 @@
       "key": "navigation_functionname_17",
       "text": "锻造炉"
     },
-    "npcName": "锻造炉",
+    "npcName": [
+      "锻造炉"
+    ],
     "functionicon": "ty_qp_wdj"
   },
   {
@@ -191,7 +216,9 @@
       "key": "navigation_functionname_18",
       "text": "手册台"
     },
-    "npcName": "手册台",
+    "npcName": [
+      "手册台"
+    ],
     "functionicon": "ty_qp_sj"
   },
   {
@@ -206,7 +233,9 @@
       "key": "navigation_functionname_19",
       "text": "总教习"
     },
-    "npcName": "总教习",
+    "npcName": [
+      "总教习"
+    ],
     "functionicon": "ty_qp_jx"
   },
   {
@@ -221,7 +250,9 @@
       "key": "navigation_functionname_20",
       "text": "阿宝"
     },
-    "npcName": "阿宝",
+    "npcName": [
+      "阿宝"
+    ],
     "functionicon": "ty_qp_mryj"
   },
   {
@@ -236,7 +267,9 @@
       "key": "navigation_functionname_21",
       "text": "告示板"
     },
-    "npcName": "告示板",
+    "npcName": [
+      "告示板"
+    ],
     "functionicon": "ty_qp_gsb"
   },
   {
@@ -251,7 +284,9 @@
       "key": "navigation_functionname_22",
       "text": "木桩1"
     },
-    "npcName": "木桩",
+    "npcName": [
+      "木桩"
+    ],
     "functionicon": "ty_qp_mz"
   }
 ]

bin/json/game_vikingboss.json

@@ -56,6 +56,12 @@
       }
     ],
     "drop": 1004,
+    "heroexp": 100,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -134,6 +140,12 @@
       }
     ],
     "drop": 1005,
+    "heroexp": 101,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -212,6 +224,12 @@
       }
     ],
     "drop": 1006,
+    "heroexp": 102,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -290,6 +308,12 @@
       }
     ],
     "drop": 1007,
+    "heroexp": 100,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -368,6 +392,12 @@
       }
     ],
     "drop": 1008,
+    "heroexp": 101,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -446,6 +476,12 @@
       }
     ],
     "drop": 1009,
+    "heroexp": 102,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -524,6 +560,12 @@
       }
     ],
     "drop": 1010,
+    "heroexp": 103,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -602,6 +644,12 @@
       }
     ],
     "drop": 1011,
+    "heroexp": 104,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -680,6 +728,12 @@
       }
     ],
     "drop": 1012,
+    "heroexp": 105,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -758,6 +812,12 @@
       }
     ],
     "drop": 1013,
+    "heroexp": 106,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -836,6 +896,12 @@
       }
     ],
     "drop": 1014,
+    "heroexp": 107,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11003,
     "boss_skill": 51004,
@@ -914,6 +980,12 @@
       }
     ],
     "drop": 1015,
+    "heroexp": 108,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11003,
     "boss_skill": 51004,
@@ -992,6 +1064,12 @@
       }
     ],
     "drop": 1016,
+    "heroexp": 109,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11003,
     "boss_skill": 51004,
@@ -1070,6 +1148,12 @@
       }
     ],
     "drop": 1017,
+    "heroexp": 110,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11003,
     "boss_skill": 51004,
@@ -1148,6 +1232,12 @@
       }
     ],
     "drop": 1018,
+    "heroexp": 111,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11003,
     "boss_skill": 51004,
@@ -1226,6 +1316,12 @@
       }
     ],
     "drop": 1019,
+    "heroexp": 112,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11003,
     "boss_skill": 51004,
@@ -1304,6 +1400,12 @@
       }
     ],
     "drop": 1020,
+    "heroexp": 113,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11003,
     "boss_skill": 51004,
@@ -1382,6 +1484,12 @@
       }
     ],
     "drop": 1021,
+    "heroexp": 114,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11003,
     "boss_skill": 51004,
@@ -1460,6 +1568,12 @@
       }
     ],
     "drop": 1022,
+    "heroexp": 115,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11003,
     "boss_skill": 51004,
@@ -1538,6 +1652,12 @@
       }
     ],
     "drop": 1023,
+    "heroexp": 116,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11003,
     "boss_skill": 51004,
@@ -1616,6 +1736,12 @@
       }
     ],
     "drop": 1024,
+    "heroexp": 117,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11018,
     "boss_skill": 51004,
@@ -1694,6 +1820,12 @@
       }
     ],
     "drop": 1025,
+    "heroexp": 118,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11018,
     "boss_skill": 51004,
@@ -1772,6 +1904,12 @@
       }
     ],
     "drop": 1026,
+    "heroexp": 119,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11018,
     "boss_skill": 51004,
@@ -1850,6 +1988,12 @@
       }
     ],
     "drop": 1027,
+    "heroexp": 120,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11018,
     "boss_skill": 51004,
@@ -1928,6 +2072,12 @@
       }
     ],
     "drop": 1028,
+    "heroexp": 121,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11018,
     "boss_skill": 51004,
@@ -2006,6 +2156,12 @@
       }
     ],
     "drop": 1029,
+    "heroexp": 122,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11018,
     "boss_skill": 51004,
@@ -2084,6 +2240,12 @@
       }
     ],
     "drop": 1030,
+    "heroexp": 123,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11018,
     "boss_skill": 51004,
@@ -2162,6 +2324,12 @@
       }
     ],
     "drop": 1004,
+    "heroexp": 124,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11018,
     "boss_skill": 51004,
@@ -2240,6 +2408,12 @@
       }
     ],
     "drop": 1005,
+    "heroexp": 125,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11018,
     "boss_skill": 51004,
@@ -2318,6 +2492,12 @@
       }
     ],
     "drop": 1006,
+    "heroexp": 126,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "bossfight_spinymandrilla_02",
     "bossmodel": 11018,
     "boss_skill": 51004,
@@ -2396,6 +2576,12 @@
       }
     ],
     "drop": 1007,
+    "heroexp": 127,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -2474,6 +2660,12 @@
       }
     ],
     "drop": 1008,
+    "heroexp": 128,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -2552,6 +2744,12 @@
       }
     ],
     "drop": 1003,
+    "heroexp": 129,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -2630,6 +2828,12 @@
       }
     ],
     "drop": 1004,
+    "heroexp": 130,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -2708,6 +2912,12 @@
       }
     ],
     "drop": 1005,
+    "heroexp": 131,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -2786,6 +2996,12 @@
       }
     ],
     "drop": 1006,
+    "heroexp": 132,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -2864,6 +3080,12 @@
       }
     ],
     "drop": 1007,
+    "heroexp": 133,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -2942,6 +3164,12 @@
       }
     ],
     "drop": 1008,
+    "heroexp": 134,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -3020,6 +3248,12 @@
       }
     ],
     "drop": 1009,
+    "heroexp": 135,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -3098,6 +3332,12 @@
       }
     ],
     "drop": 1010,
+    "heroexp": 136,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -3176,6 +3416,12 @@
       }
     ],
     "drop": 1001,
+    "heroexp": 137,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -3254,6 +3500,12 @@
       }
     ],
     "drop": 1002,
+    "heroexp": 138,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -3332,6 +3584,12 @@
       }
     ],
     "drop": 1003,
+    "heroexp": 139,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -3410,6 +3668,12 @@
       }
     ],
     "drop": 1004,
+    "heroexp": 140,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -3488,6 +3752,12 @@
       }
     ],
     "drop": 1005,
+    "heroexp": 141,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -3566,6 +3836,12 @@
       }
     ],
     "drop": 1006,
+    "heroexp": 142,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -3644,6 +3920,12 @@
       }
     ],
     "drop": 1007,
+    "heroexp": 143,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -3722,6 +4004,12 @@
       }
     ],
     "drop": 1008,
+    "heroexp": 144,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -3800,6 +4088,12 @@
       }
     ],
     "drop": 1009,
+    "heroexp": 145,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -3878,6 +4172,12 @@
       }
     ],
     "drop": 1010,
+    "heroexp": 146,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
     "boss_skill": 51004,
@@ -3905,7 +4205,7 @@
     "bossid": 31,
     "name": {
       "key": "viking_boss_1001",
-      "text": "火焰泰坦"
+      "text": "阿宝"
     },
     "difficulty": 1,
     "BattleReadyID": 120,
@@ -3931,9 +4231,15 @@
       }
     ],
     "drop": 30401,
+    "heroexp": 147,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
-    "boss_skill": 51004,
+    "boss_skill": 25001,
     "boss": [
       710001
     ],
@@ -3958,7 +4264,7 @@
     "bossid": 31,
     "name": {
       "key": "viking_boss_1001",
-      "text": "火焰泰坦"
+      "text": "阿宝"
     },
     "difficulty": 2,
     "BattleReadyID": 120,
@@ -3989,9 +4295,15 @@
       }
     ],
     "drop": 30402,
+    "heroexp": 148,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
-    "boss_skill": 51004,
+    "boss_skill": 25001,
     "boss": [
       710001
     ],
@@ -4016,7 +4328,7 @@
     "bossid": 31,
     "name": {
       "key": "viking_boss_1001",
-      "text": "火焰泰坦"
+      "text": "阿宝"
     },
     "difficulty": 3,
     "BattleReadyID": 120,
@@ -4052,9 +4364,15 @@
       }
     ],
     "drop": 30403,
+    "heroexp": 149,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
-    "boss_skill": 51004,
+    "boss_skill": 25001,
     "boss": [
       710001
     ],
@@ -4079,7 +4397,7 @@
     "bossid": 31,
     "name": {
       "key": "viking_boss_1001",
-      "text": "火焰泰坦"
+      "text": "阿宝"
     },
     "difficulty": 4,
     "BattleReadyID": 120,
@@ -4115,9 +4433,15 @@
       }
     ],
     "drop": 30403,
+    "heroexp": 150,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
-    "boss_skill": 51004,
+    "boss_skill": 25001,
     "boss": [
       710001
     ],
@@ -4142,7 +4466,7 @@
     "bossid": 31,
     "name": {
       "key": "viking_boss_1001",
-      "text": "火焰泰坦"
+      "text": "阿宝"
     },
     "difficulty": 5,
     "BattleReadyID": 120,
@@ -4178,9 +4502,15 @@
       }
     ],
     "drop": 30403,
+    "heroexp": 151,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
-    "boss_skill": 51004,
+    "boss_skill": 25001,
     "boss": [
       710001
     ],
@@ -4205,7 +4535,7 @@
     "bossid": 31,
     "name": {
       "key": "viking_boss_1001",
-      "text": "火焰泰坦"
+      "text": "阿宝"
     },
     "difficulty": 6,
     "BattleReadyID": 120,
@@ -4241,9 +4571,15 @@
       }
     ],
     "drop": 30403,
+    "heroexp": 152,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
-    "boss_skill": 51004,
+    "boss_skill": 25001,
     "boss": [
       710001
     ],
@@ -4268,7 +4604,7 @@
     "bossid": 31,
     "name": {
       "key": "viking_boss_1001",
-      "text": "火焰泰坦"
+      "text": "阿宝"
     },
     "difficulty": 7,
     "BattleReadyID": 120,
@@ -4304,9 +4640,15 @@
       }
     ],
     "drop": 30403,
+    "heroexp": 153,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
-    "boss_skill": 51004,
+    "boss_skill": 25001,
     "boss": [
       710001
     ],
@@ -4331,7 +4673,7 @@
     "bossid": 31,
     "name": {
       "key": "viking_boss_1001",
-      "text": "火焰泰坦"
+      "text": "阿宝"
     },
     "difficulty": 8,
     "BattleReadyID": 120,
@@ -4367,9 +4709,15 @@
       }
     ],
     "drop": 30403,
+    "heroexp": 154,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
-    "boss_skill": 51004,
+    "boss_skill": 25001,
     "boss": [
       710001
     ],
@@ -4394,7 +4742,7 @@
     "bossid": 31,
     "name": {
       "key": "viking_boss_1001",
-      "text": "火焰泰坦"
+      "text": "阿宝"
     },
     "difficulty": 9,
     "BattleReadyID": 120,
@@ -4430,9 +4778,15 @@
       }
     ],
     "drop": 30403,
+    "heroexp": 155,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
-    "boss_skill": 51004,
+    "boss_skill": 25001,
     "boss": [
       710001
     ],
@@ -4457,7 +4811,7 @@
     "bossid": 31,
     "name": {
       "key": "viking_boss_1001",
-      "text": "火焰泰坦"
+      "text": "阿宝"
     },
     "difficulty": 10,
     "BattleReadyID": 120,
@@ -4493,9 +4847,15 @@
       }
     ],
     "drop": 30403,
+    "heroexp": 156,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
-    "boss_skill": 51004,
+    "boss_skill": 25001,
     "boss": [
       710001
     ],
@@ -4520,7 +4880,7 @@
     "bossid": 31,
     "name": {
       "key": "viking_boss_1001",
-      "text": "火焰泰坦"
+      "text": "阿宝"
     },
     "difficulty": 11,
     "BattleReadyID": 120,
@@ -4556,9 +4916,15 @@
       }
     ],
     "drop": 30403,
+    "heroexp": 157,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
-    "boss_skill": 51004,
+    "boss_skill": 25001,
     "boss": [
       710001
     ],
@@ -4583,7 +4949,7 @@
     "bossid": 31,
     "name": {
       "key": "viking_boss_1001",
-      "text": "火焰泰坦"
+      "text": "阿宝"
     },
     "difficulty": 12,
     "BattleReadyID": 120,
@@ -4619,9 +4985,15 @@
       }
     ],
     "drop": 30403,
+    "heroexp": 158,
+    "manexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    },
     "scene": "",
     "bossmodel": 11009,
-    "boss_skill": 51004,
+    "boss_skill": 25001,
     "boss": [
       710001
     ],

bin/json/game_vikingbossskill.json

@@ -94,17 +94,17 @@
     "copytype": 4,
     "name": {
       "key": "viking_boss_1001",
-      "text": "火焰泰坦"
+      "text": "阿宝"
     },
     "back_png": "xmwg_jyfb_boss1",
     "introduce": {
       "key": "viking_boss_20001",
-      "text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜"
+      "text": "一只来自于中国的滚滚"
     },
-    "icon": "wjyz_img012",
+    "icon": "action_11001",
     "guardskill": [
-      124004111,
+      125001111,
-      144005111
+      125001211
     ]
   }
 ]

modules/smithy/api_forgeequip.go

@@ -101,16 +101,8 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
 			code = pb.ErrorCode_SmithyLackLava // 缺少熔岩
 			return
 		}
-		// 检查消耗
+
-		lavaCost := &cfg.Gameatn{
+		costRes = append(costRes, exemption)
-			A: exemption.A,
-			T: exemption.T,
-			N: exemption.N,
-		}
-		// if code = this.module.CheckRes(session, []*cfg.Gameatn{lavaCost}); code != pb.ErrorCode_Success {
-		// 	return
-		// }
-		costRes = append(costRes, lavaCost)
 	} else {
 		// 检查炉温 是否够
 		if stove.Temperature < needT {
@@ -123,7 +115,6 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
 
 	costRes = append(costRes, reelcfg.BasicCos...)
 	subAtn := this.module.modelStove.CheckForgeConsume(req.ReelId, stove.Data[req.ReelId].Lv)
-	//costRes = append(costRes, subAtn...)
 	// 异常处理 防止不消耗该道具 但是技能做了该道具的减免
 	_costRes := make([]*cfg.Gameatn, len(costRes))
 	for i, v := range costRes {

modules/viking/api_challengeover.go

@@ -130,7 +130,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
 			res = append(res, v)
 		}
 	}
-
+	res = append(res, vikingCfg.Manexp) //给玩家加经验
 	if code, atno = this.module.DispenseAtno(session, res, true); code != pb.ErrorCode_Success {
 		return
 	}
@@ -142,6 +142,17 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
 			viking.RecoveryTime = userexpand.Recovertimeunifiedticket
 		}
 	}
+
+	// 加经验
+	if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 {
+		for _, v := range req.Report.Info.Redflist[0].Team {
+			if vikingCfg.Heroexp > 0 && !v.Ishelp { // 助战英雄不加经验
+				this.module.ModuleHero.AddHeroExp(session, v.Oid, vikingCfg.Heroexp)
+			}
+		}
+	}
+	//给玩家加经验
+
 	session.SendMsg(string(this.module.GetType()), VikingChallengeOverResp, &pb.VikingChallengeOverResp{
 		Data:    viking,
 		Asset:   atno,

sys/configure/structs/Game.NavigationData.go

@@ -16,7 +16,7 @@ type GameNavigationData struct {
     Scenename string
     Sceneicon string
     Functionname string
-    NpcName string
+    NpcName []string
     Functionicon string
 }
 
@@ -32,7 +32,20 @@ func (_v *GameNavigationData)Deserialize(_buf map[string]interface{}) (err error
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["scenename"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Scenename error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Scenename, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     { var _ok_ bool; if _v.Sceneicon, _ok_ = _buf["sceneicon"].(string); !_ok_ { err = errors.New("sceneicon error"); return } }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["functionname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Functionname error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Functionname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
-    { var _ok_ bool; if _v.NpcName, _ok_ = _buf["npcName"].(string); !_ok_ { err = errors.New("npcName error"); return } }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["npcName"].([]interface{}); !_ok_ { err = errors.New("npcName error"); return }
+
+                _v.NpcName = 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.NpcName = append(_v.NpcName, _list_v_)
+                }
+            }
+
     { var _ok_ bool; if _v.Functionicon, _ok_ = _buf["functionicon"].(string); !_ok_ { err = errors.New("functionicon error"); return } }
     return
 }

sys/configure/structs/Game.VikingBossData.go

@@ -21,6 +21,8 @@ type GameVikingBossData struct {
     Firstprize []*Gameatn
     Dropshow []*Gameatn
     Drop int32
+    Heroexp int32
+    Manexp *Gameatn
     Scene string
     Bossmodel int32
     BossSkill int32
@@ -85,6 +87,8 @@ func (_v *GameVikingBossData)Deserialize(_buf map[string]interface{}) (err error
             }
 
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["drop"].(float64); !_ok_ { err = errors.New("drop error"); return }; _v.Drop = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["heroexp"].(float64); !_ok_ { err = errors.New("heroexp error"); return }; _v.Heroexp = int32(_tempNum_) }
+    { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["manexp"].(map[string]interface{}); !_ok_ { err = errors.New("manexp error"); return }; if _v.Manexp, err = DeserializeGameatn(_x_); err != nil { return } }
     { var _ok_ bool; if _v.Scene, _ok_ = _buf["scene"].(string); !_ok_ { err = errors.New("scene error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bossmodel"].(float64); !_ok_ { err = errors.New("bossmodel error"); return }; _v.Bossmodel = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["boss_skill"].(float64); !_ok_ { err = errors.New("boss_skill error"); return }; _v.BossSkill = int32(_tempNum_) }

sys/configure/structs/Game.itinerant_lvData.go

@@ -14,6 +14,7 @@ type Gameitinerant_lvData struct {
     Lv int32
     Newmoneyexp int32
     Bagtop int32
+    Bagtagnum int32
     Tickettop *Gameatn
     Moneynumtop *Gameatn
     Bargainpro int32
@@ -31,6 +32,7 @@ func (_v *Gameitinerant_lvData)Deserialize(_buf map[string]interface{}) (err err
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv"].(float64); !_ok_ { err = errors.New("lv error"); return }; _v.Lv = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["newmoneyexp"].(float64); !_ok_ { err = errors.New("newmoneyexp error"); return }; _v.Newmoneyexp = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bagtop"].(float64); !_ok_ { err = errors.New("bagtop error"); return }; _v.Bagtop = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bagtagnum"].(float64); !_ok_ { err = errors.New("bagtagnum error"); return }; _v.Bagtagnum = int32(_tempNum_) }
     { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["tickettop"].(map[string]interface{}); !_ok_ { err = errors.New("tickettop error"); return }; if _v.Tickettop, err = DeserializeGameatn(_x_); err != nil { return } }
     { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["moneynumtop"].(map[string]interface{}); !_ok_ { err = errors.New("moneynumtop error"); return }; if _v.Moneynumtop, err = DeserializeGameatn(_x_); err != nil { return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bargainpro"].(float64); !_ok_ { err = errors.New("bargainpro error"); return }; _v.Bargainpro = int32(_tempNum_) }

sys/configure/structs/Game.itinerant_reward.go

@@ -21,7 +21,7 @@ func NewGameitinerant_reward(_buf []map[string]interface{}) (*Gameitinerant_rewa
 			return nil, err2
 		} else {
 			_dataList = append(_dataList, _v)
-			dataMap[_v.Num] = _v
+			dataMap[_v.Key] = _v
 		}
 	}
 	return &Gameitinerant_reward{_dataList:_dataList, _dataMap:dataMap}, nil

sys/configure/structs/Game.itinerant_rewardData.go

@@ -11,8 +11,9 @@ package cfg
 import "errors"
 
 type Gameitinerant_rewardData struct {
-    Num int32
+    Key int32
-    Type int32
+    Moneystart int32
+    Moneyend int32
     Reward []*Gameatn
 }
 
@@ -23,8 +24,9 @@ func (*Gameitinerant_rewardData) GetTypeId() int32 {
 }
 
 func (_v *Gameitinerant_rewardData)Deserialize(_buf map[string]interface{}) (err error) {
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["num"].(float64); !_ok_ { err = errors.New("num error"); return }; _v.Num = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["moneystart"].(float64); !_ok_ { err = errors.New("moneystart error"); return }; _v.Moneystart = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["moneyend"].(float64); !_ok_ { err = errors.New("moneyend error"); return }; _v.Moneyend = int32(_tempNum_) }
      {
                 var _arr_ []interface{}
                 var _ok_ bool

sys/configure/structs/Game.itinerant_thingData.go

@@ -25,6 +25,7 @@ type Gameitinerant_thingData struct {
     FluctuationRange int32
     Pricemin int32
     Pricemax int32
+    Goodsnum int32
 }
 
 const TypeId_Gameitinerant_thingData = -91590553
@@ -113,6 +114,7 @@ func (_v *Gameitinerant_thingData)Deserialize(_buf map[string]interface{}) (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
 }