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

bin/json/game_combatlevel.json

@@ -175,9 +175,7 @@
     "id": 10008,
     "scene": "leveldemo_fcamer_1_8",
     "levelname": "Save the holy tree",
-    "passformatList": [
+    "passformatList": [],
-      720013
-    ],
     "passdroplist": [
       10301,
       10302

bin/json/game_heroskill.json

@@ -1,62 +1,62 @@
-[
+[
-  {
+  {
-    "star": 1,
+    "star": 1,
-    "needgold": [
+    "needgold": [
-      {
+      {
-        "a": "attr",
+        "a": "attr",
-        "t": "gold",
+        "t": "gold",
-        "n": 10000
+        "n": 10000
-      }
+      }
-    ]
+    ]
-  },
+  },
-  {
+  {
-    "star": 2,
+    "star": 2,
-    "needgold": [
+    "needgold": [
-      {
+      {
-        "a": "attr",
+        "a": "attr",
-        "t": "gold",
+        "t": "gold",
-        "n": 10000
+        "n": 10000
-      }
+      }
-    ]
+    ]
-  },
+  },
-  {
+  {
-    "star": 3,
+    "star": 3,
-    "needgold": [
+    "needgold": [
-      {
+      {
-        "a": "attr",
+        "a": "attr",
-        "t": "gold",
+        "t": "gold",
-        "n": 10000
+        "n": 10000
-      }
+      }
-    ]
+    ]
-  },
+  },
-  {
+  {
-    "star": 4,
+    "star": 4,
-    "needgold": [
+    "needgold": [
-      {
+      {
-        "a": "attr",
+        "a": "attr",
-        "t": "gold",
+        "t": "gold",
-        "n": 10000
+        "n": 10000
-      }
+      }
-    ]
+    ]
-  },
+  },
-  {
+  {
-    "star": 5,
+    "star": 5,
-    "needgold": [
+    "needgold": [
-      {
+      {
-        "a": "attr",
+        "a": "attr",
-        "t": "gold",
+        "t": "gold",
-        "n": 10000
+        "n": 10000
-      }
+      }
-    ]
+    ]
-  },
+  },
-  {
+  {
-    "star": 6,
+    "star": 6,
-    "needgold": [
+    "needgold": [
-      {
+      {
-        "a": "attr",
+        "a": "attr",
-        "t": "gold",
+        "t": "gold",
-        "n": 10000
+        "n": 10000
-      }
+      }
-    ]
+    ]
-  }
+  }
 ]

bin/json/game_monsterformat.json

@@ -15425,7 +15425,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "monster": -1,
-    "lv": 75,
+    "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
     "defpro": 0.8,
@@ -15437,7 +15437,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "monster": -1,
-    "lv": 75,
+    "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
     "defpro": 0.8,
@@ -15449,7 +15449,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "monster": 510025,
-    "lv": 75,
+    "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
     "defpro": 0.8,
@@ -15461,7 +15461,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "monster": 340065,
-    "lv": 75,
+    "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
     "defpro": 0.8,
@@ -15473,7 +15473,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "monster": 510025,
-    "lv": 75,
+    "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
     "defpro": 0.8,
@@ -15485,7 +15485,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "monster": -1,
-    "lv": 75,
+    "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
     "defpro": 0.8,
@@ -15497,7 +15497,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "monster": -1,
-    "lv": 75,
+    "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
     "defpro": 0.8,
@@ -15509,7 +15509,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "monster": 510025,
-    "lv": 75,
+    "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
     "defpro": 0.8,
@@ -15521,7 +15521,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "monster": 240025,
-    "lv": 75,
+    "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
     "defpro": 0.8,
@@ -15533,7 +15533,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "monster": 510025,
-    "lv": 75,
+    "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
     "defpro": 0.8,
@@ -15545,7 +15545,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "monster": -1,
-    "lv": 80,
+    "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
     "defpro": 0.8,
@@ -15557,7 +15557,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "monster": -1,
-    "lv": 80,
+    "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
     "defpro": 0.8,
@@ -15569,7 +15569,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "monster": 340065,
-    "lv": 80,
+    "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
     "defpro": 0.8,
@@ -15581,7 +15581,7 @@
     "captainId": 0,
     "IsBoss": 1,
     "monster": 110215,
-    "lv": 80,
+    "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
     "defpro": 0.8,
@@ -15593,7 +15593,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "monster": 240025,
-    "lv": 80,
+    "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
     "defpro": 0.8,
@@ -82282,5 +82282,185 @@
     "atkpro": 1,
     "defpro": 1,
     "modelsize": 1
+  },
+  {
+    "Id": 801010,
+    "pos": 1,
+    "captainId": 0,
+    "IsBoss": 0,
+    "monster": -1,
+    "lv": 60,
+    "hppro": 0.6,
+    "atkpro": 1,
+    "defpro": 0.8,
+    "modelsize": 1
+  },
+  {
+    "Id": 801010,
+    "pos": 2,
+    "captainId": 0,
+    "IsBoss": 0,
+    "monster": -1,
+    "lv": 60,
+    "hppro": 0.6,
+    "atkpro": 1,
+    "defpro": 0.8,
+    "modelsize": 1
+  },
+  {
+    "Id": 801010,
+    "pos": 3,
+    "captainId": 0,
+    "IsBoss": 0,
+    "monster": 510025,
+    "lv": 60,
+    "hppro": 0.6,
+    "atkpro": 1,
+    "defpro": 0.8,
+    "modelsize": 1
+  },
+  {
+    "Id": 801010,
+    "pos": 4,
+    "captainId": 0,
+    "IsBoss": 0,
+    "monster": 340065,
+    "lv": 60,
+    "hppro": 0.6,
+    "atkpro": 1,
+    "defpro": 0.8,
+    "modelsize": 1
+  },
+  {
+    "Id": 801010,
+    "pos": 5,
+    "captainId": 0,
+    "IsBoss": 0,
+    "monster": 510025,
+    "lv": 60,
+    "hppro": 0.6,
+    "atkpro": 1,
+    "defpro": 0.8,
+    "modelsize": 1
+  },
+  {
+    "Id": 801020,
+    "pos": 1,
+    "captainId": 0,
+    "IsBoss": 0,
+    "monster": -1,
+    "lv": 60,
+    "hppro": 0.6,
+    "atkpro": 1,
+    "defpro": 0.8,
+    "modelsize": 1
+  },
+  {
+    "Id": 801020,
+    "pos": 2,
+    "captainId": 0,
+    "IsBoss": 0,
+    "monster": -1,
+    "lv": 60,
+    "hppro": 0.6,
+    "atkpro": 1,
+    "defpro": 0.8,
+    "modelsize": 1
+  },
+  {
+    "Id": 801020,
+    "pos": 3,
+    "captainId": 0,
+    "IsBoss": 0,
+    "monster": 510025,
+    "lv": 60,
+    "hppro": 0.6,
+    "atkpro": 1,
+    "defpro": 0.8,
+    "modelsize": 1
+  },
+  {
+    "Id": 801020,
+    "pos": 4,
+    "captainId": 0,
+    "IsBoss": 0,
+    "monster": 240025,
+    "lv": 60,
+    "hppro": 0.6,
+    "atkpro": 1,
+    "defpro": 0.8,
+    "modelsize": 1
+  },
+  {
+    "Id": 801020,
+    "pos": 5,
+    "captainId": 0,
+    "IsBoss": 0,
+    "monster": 510025,
+    "lv": 60,
+    "hppro": 0.6,
+    "atkpro": 1,
+    "defpro": 0.8,
+    "modelsize": 1
+  },
+  {
+    "Id": 801030,
+    "pos": 1,
+    "captainId": 0,
+    "IsBoss": 0,
+    "monster": -1,
+    "lv": 60,
+    "hppro": 0.6,
+    "atkpro": 1,
+    "defpro": 0.8,
+    "modelsize": 1
+  },
+  {
+    "Id": 801030,
+    "pos": 2,
+    "captainId": 0,
+    "IsBoss": 0,
+    "monster": -1,
+    "lv": 60,
+    "hppro": 0.6,
+    "atkpro": 1,
+    "defpro": 0.8,
+    "modelsize": 1
+  },
+  {
+    "Id": 801030,
+    "pos": 3,
+    "captainId": 0,
+    "IsBoss": 0,
+    "monster": 340065,
+    "lv": 60,
+    "hppro": 0.6,
+    "atkpro": 1,
+    "defpro": 0.8,
+    "modelsize": 1
+  },
+  {
+    "Id": 801030,
+    "pos": 4,
+    "captainId": 0,
+    "IsBoss": 1,
+    "monster": 110215,
+    "lv": 60,
+    "hppro": 0.6,
+    "atkpro": 1,
+    "defpro": 0.8,
+    "modelsize": 1
+  },
+  {
+    "Id": 801030,
+    "pos": 5,
+    "captainId": 0,
+    "IsBoss": 0,
+    "monster": 240025,
+    "lv": 60,
+    "hppro": 0.6,
+    "atkpro": 1,
+    "defpro": 0.8,
+    "modelsize": 1
   }
 ]

bin/json/game_msgdistrib.json

@@ -108,7 +108,7 @@
     "describe": "pvp"
   },
   {
-    "msgid": "fitness",
+    "msgid": "practice",
     "open": true,
     "routrules": "~/worker",
     "describe": "武馆练功房"

bin/json/game_opencond.json

@@ -56,7 +56,7 @@
       }
     ],
     "optional": "",
-    "wkqbx": 0,
+    "wkqbx": 1,
     "kqbx": 0,
     "img": "zc_icon_01",
     "prompt": {
@@ -96,7 +96,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -118,7 +118,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -162,11 +162,11 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
-    "wkqbx": 0,
+    "wkqbx": 2,
     "kqbx": 0,
     "img": "zc_icon_01",
     "prompt": {
@@ -184,7 +184,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 3
       }
     ],
     "optional": "",
@@ -250,7 +250,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -294,7 +294,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -316,7 +316,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -338,7 +338,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -360,7 +360,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -382,7 +382,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -404,7 +404,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -426,7 +426,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -448,7 +448,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -470,7 +470,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -492,7 +492,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -514,7 +514,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -536,7 +536,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -558,7 +558,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -646,7 +646,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -822,7 +822,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -844,7 +844,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -888,7 +888,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -910,7 +910,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -954,7 +954,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -976,7 +976,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -998,7 +998,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -1020,7 +1020,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -1218,7 +1218,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -1240,7 +1240,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -1262,7 +1262,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -1284,7 +1284,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -1306,7 +1306,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",
@@ -1328,7 +1328,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 30
       }
     ],
     "optional": "",

bin/json/game_shop.json

@@ -215,5 +215,43 @@
       50006,
       50007
     ]
+  },
+  {
+    "shopid": 7,
+    "tab": 7,
+    "shopname": {
+      "key": "shop_7",
+      "text": "铁匠商店"
+    },
+    "upper_shop": {
+      "key": "shop_title1",
+      "text": "玩法商店"
+    },
+    "needshow": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 1
+      }
+    ],
+    "rtype": 3,
+    "rtime": 1,
+    "rnum": -1,
+    "rneed": [],
+    "shopitem": [
+      70001,
+      70002,
+      70003,
+      70004,
+      70005,
+      70006,
+      70007,
+      70008,
+      70009,
+      70010,
+      70011,
+      70012,
+      70013
+    ]
   }
 ]

bin/json/game_shopitem.json

@@ -652,9 +652,9 @@
     "id": 10001,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "43901",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -688,9 +688,9 @@
     "id": 10001,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "42911",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -1408,9 +1408,9 @@
     "id": 10002,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "43901",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -1444,9 +1444,9 @@
     "id": 10002,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "42911",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -1480,9 +1480,9 @@
     "id": 10002,
     "iteminfo": [
       {
-        "a": "item",
+        "a": "attr",
-        "t": "30001",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -2164,9 +2164,9 @@
     "id": 10003,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "43901",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -2200,9 +2200,9 @@
     "id": 10003,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "42911",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -2920,9 +2920,9 @@
     "id": 10004,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "43901",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -2956,9 +2956,9 @@
     "id": 10004,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "42911",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -3676,9 +3676,9 @@
     "id": 10005,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "43901",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -3712,9 +3712,9 @@
     "id": 10005,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "42911",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -4432,9 +4432,9 @@
     "id": 10006,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "43901",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -4468,9 +4468,9 @@
     "id": 10006,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "42911",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -5188,9 +5188,9 @@
     "id": 10007,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "43901",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -5224,9 +5224,9 @@
     "id": 10007,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "42911",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -5944,9 +5944,9 @@
     "id": 10008,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "43901",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -5980,9 +5980,9 @@
     "id": 10008,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "42911",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -6412,9 +6412,9 @@
     "id": 30001,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "43921",
+        "t": "diamond",
-        "n": 100
+        "n": 50
       }
     ],
     "preview": false,
@@ -6448,9 +6448,9 @@
     "id": 30002,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "43901",
+        "t": "diamond",
-        "n": 100
+        "n": 50
       }
     ],
     "preview": false,
@@ -6484,9 +6484,9 @@
     "id": 30003,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "42911",
+        "t": "diamond",
-        "n": 100
+        "n": 50
       }
     ],
     "preview": false,
@@ -6520,9 +6520,9 @@
     "id": 40001,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "45921",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -6556,9 +6556,9 @@
     "id": 40002,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "43903",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -6628,9 +6628,9 @@
     "id": 40004,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "44921",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -6664,9 +6664,9 @@
     "id": 40005,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "43902",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -6916,9 +6916,9 @@
     "id": 50006,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "43902",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -6952,9 +6952,9 @@
     "id": 50007,
     "iteminfo": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "43903",
+        "t": "diamond",
-        "n": 1
+        "n": 50
       }
     ],
     "preview": false,
@@ -7090,5 +7090,473 @@
     "lvmax": 60,
     "mapidmin": 101,
     "mapidmax": 9999
+  },
+  {
+    "key": 198,
+    "id": 70001,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "120001",
+        "n": 100
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 20
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 999,
+    "buymaxnum": 999,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 199,
+    "id": 70002,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "120002",
+        "n": 100
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 20
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 999,
+    "buymaxnum": 999,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 200,
+    "id": 70003,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "120003",
+        "n": 100
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 20
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 999,
+    "buymaxnum": 999,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 201,
+    "id": 70004,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "120004",
+        "n": 100
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 20
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 999,
+    "buymaxnum": 999,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 202,
+    "id": 70005,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "120005",
+        "n": 100
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 20
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 999,
+    "buymaxnum": 999,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 203,
+    "id": 70006,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "120006",
+        "n": 100
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 20
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 999,
+    "buymaxnum": 999,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 204,
+    "id": 70007,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "120007",
+        "n": 100
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 20
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 999,
+    "buymaxnum": 999,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 205,
+    "id": 70008,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "120008",
+        "n": 100
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 20
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 999,
+    "buymaxnum": 999,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 206,
+    "id": 70009,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "120009",
+        "n": 100
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 20
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 999,
+    "buymaxnum": 999,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 207,
+    "id": 70010,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "120101",
+        "n": 100
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 20
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 999,
+    "buymaxnum": 999,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 208,
+    "id": 70011,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "120102",
+        "n": 100
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 20
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 999,
+    "buymaxnum": 999,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 209,
+    "id": 70012,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "120103",
+        "n": 100
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 20
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 999,
+    "buymaxnum": 999,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 210,
+    "id": 70013,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "120104",
+        "n": 100
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 20
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 999,
+    "buymaxnum": 999,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
   }
 ]

bin/json/game_vikingbossskill.json

@@ -95,10 +95,61 @@
       "key": "viking_boss_20001",
       "text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜"
     },
+    "icon": "wjyz_img012",
+    "guardskill": [
+      124004111,
+      144005111
+    ]
+  },
+  {
+    "bossid": 32,
+    "copytype": 4,
+    "name": {
+      "key": "viking_boss_1002",
+      "text": "冰之泰坦"
+    },
+    "introduce": {
+      "key": "viking_boss_1005",
+      "text": "冰霜泰坦巨人从极寒之地而来，没有什么比它更寒冷了"
+    },
+    "icon": "wjyz_img011",
+    "guardskill": [
+      124004111,
+      144005111
+    ]
+  },
+  {
+    "bossid": 33,
+    "copytype": 4,
+    "name": {
+      "key": "viking_boss_1003",
+      "text": "森林泰坦"
+    },
+    "introduce": {
+      "key": "viking_boss_1006",
+      "text": "森林泰坦诞生于广袤的森林之中，是所有动物们的守护神"
+    },
     "icon": "wjyz_img013",
     "guardskill": [
       124004111,
       144005111
     ]
+  },
+  {
+    "bossid": 34,
+    "copytype": 4,
+    "name": {
+      "key": "viking_boss_1001",
+      "text": "武器BOSS"
+    },
+    "introduce": {
+      "key": "viking_boss_1006",
+      "text": "森林泰坦诞生于广袤的森林之中，是所有动物们的守护神"
+    },
+    "icon": "wjyz_img011",
+    "guardskill": [
+      124004111,
+      144005111
+    ]
   }
 ]

bin/json/game_worldtask.json

@@ -376,7 +376,7 @@
   {
     "key": 20010,
     "lock": 1,
-    "ontxe": 30011,
+    "ontxe": 0,
     "id_after": 20011,
     "group": 2,
     "des": 2,
@@ -394,16 +394,16 @@
       "text": "新手引导"
     },
     "npc": [
-      "scenes_boundary_01_recordtask",
+      "bossfight_pt_02",
       "0新手引导-杰克-中轴城常驻待机",
-      "150"
+      "901"
     ],
     "getafter_event": [
       2,
       401
     ],
     "completetask": 0,
-    "auto_accept": 0,
+    "auto_accept": 1,
     "overtips": 1,
     "reword": []
   },
@@ -428,16 +428,16 @@
       "text": "新手引导"
     },
     "npc": [
-      "scenes_boundary_01_recordtask",
+      "bossfight_pt_02",
       "0新手引导-杰克-中轴城常驻待机",
-      "150"
+      "901"
     ],
     "getafter_event": [
       2,
       402
     ],
     "completetask": 0,
-    "auto_accept": 0,
+    "auto_accept": 1,
     "overtips": 1,
     "reword": []
   },
@@ -462,9 +462,9 @@
       "text": "新手引导"
     },
     "npc": [
-      "scenes_boundary_01_recordtask",
+      "bossfight_pt_02",
       "1.新手引导-花朵-中轴城",
-      "150"
+      "901"
     ],
     "getafter_event": [
       2,
@@ -496,9 +496,9 @@
       "text": "新手引导"
     },
     "npc": [
-      "scenes_boundary_01_recordtask",
+      "bossfight_pt_02",
       "1.新手引导-花朵-中轴城",
-      "150"
+      "901"
     ],
     "getafter_event": [
       2,
@@ -530,9 +530,9 @@
       "text": "新手引导"
     },
     "npc": [
-      "scenes_boundary_01_recordtask",
+      "bossfight_pt_02",
       "0新手引导-杰克-中轴城常驻待机",
-      "150"
+      "901"
     ],
     "getafter_event": [
       2,
@@ -564,9 +564,9 @@
       "text": "新手引导"
     },
     "npc": [
-      "scenes_boundary_01_recordtask",
+      "bossfight_pt_02",
       "3新手引导-波比-正常待机-中轴城",
-      "150"
+      "901"
     ],
     "getafter_event": [
       2,
@@ -598,9 +598,9 @@
       "text": "新手引导"
     },
     "npc": [
-      "scenes_boundary_01_recordtask",
+      "bossfight_pt_02",
       "2新手引导-邦尼兔-正常待机-中轴城",
-      "150"
+      "901"
     ],
     "getafter_event": [
       2,
@@ -638,7 +638,7 @@
       "text": "新手引导"
     },
     "npc": [
-      "scenes_boundary_01_recordtask",
+      "bossfight_pt_02",
       "新手引导-波比-右屏圣树1",
       "153"
     ],

comm/const.go

@@ -82,7 +82,6 @@ const (
 	ModulePandaTakekan core.M_Modules = "pandatakekan" //熊猫武馆
 	ModuleDispatch     core.M_Modules = "dispatch"     //武馆派遣
 	ModulePractice     core.M_Modules = "practice"     //熊猫武馆 练功系统
-	ModuleFitness      core.M_Modules = "fitness"      //熊猫武馆 每日一健
 	ModulePandaAtlas   core.M_Modules = "atlas"        //熊猫图鉴
 )