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

bin/json/game_drop.json

@@ -804,5 +804,239 @@
     ],
     "star": 1,
     "p": 1000
+  },
+  {
+    "id": 63,
+    "dropid": 60001,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10041",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 64,
+    "dropid": 60001,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10042",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 65,
+    "dropid": 60001,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10043",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 66,
+    "dropid": 60001,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10044",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 67,
+    "dropid": 60001,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10045",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 68,
+    "dropid": 60001,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10046",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 69,
+    "dropid": 60002,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10041",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 70,
+    "dropid": 60002,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10042",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 71,
+    "dropid": 60002,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10043",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 72,
+    "dropid": 60002,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10044",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 73,
+    "dropid": 60002,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10045",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 74,
+    "dropid": 60002,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10046",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 75,
+    "dropid": 60003,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10041",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 76,
+    "dropid": 60003,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10042",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 77,
+    "dropid": 60003,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10043",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 78,
+    "dropid": 60003,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10044",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 79,
+    "dropid": 60003,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10045",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 80,
+    "dropid": 60003,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10046",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
   }
 ]

bin/json/game_item.json

@@ -1521,5 +1521,116 @@
       "key": "itemtipstxt_50012",
       "text": "涌动声波-高级不足"
     }
+  },
+  {
+    "id": "60001",
+    "name": {
+      "key": "itemname_60001",
+      "text": "5星装备自选箱"
+    },
+    "usetype": 4,
+    "color": 6,
+    "bagtype": 0,
+    "index": 18,
+    "special_type": 0,
+    "time": 0,
+    "effects": "",
+    "box_id": 60001,
+    "synthetize_num": 0,
+    "access": [
+      122
+    ],
+    "use_skip": 0,
+    "upper_limit": 1,
+    "uselv": 0,
+    "isani": 0,
+    "star": 0,
+    "race": 0,
+    "img": "wp_icon_10009",
+    "ico": "wp_icon_10009",
+    "intr": {
+      "key": "itemdesc_60001",
+      "text": "可以任选一件5星装备"
+    },
+    "sale": [],
+    "synthetize_deplete": [],
+    "tipstxt": {
+      "key": "itemtipstxt_60001",
+      "text": "5星装备自选箱不足"
+    }
+  },
+  {
+    "id": "60002",
+    "name": {
+      "key": "itemname_60002",
+      "text": "5星装备随机箱"
+    },
+    "usetype": 5,
+    "color": 6,
+    "bagtype": 0,
+    "index": 18,
+    "special_type": 0,
+    "time": 0,
+    "effects": "",
+    "box_id": 60002,
+    "synthetize_num": 0,
+    "access": [
+      122
+    ],
+    "use_skip": 0,
+    "upper_limit": 1,
+    "uselv": 0,
+    "isani": 0,
+    "star": 0,
+    "race": 0,
+    "img": "wp_icon_10009",
+    "ico": "wp_icon_10009",
+    "intr": {
+      "key": "itemdesc_60002",
+      "text": "可以随机获得一件5星装备"
+    },
+    "sale": [],
+    "synthetize_deplete": [],
+    "tipstxt": {
+      "key": "itemtipstxt_60002",
+      "text": "5星装备随机箱不足"
+    }
+  },
+  {
+    "id": "60003",
+    "name": {
+      "key": "itemname_60003",
+      "text": "5星套装宝箱"
+    },
+    "usetype": 6,
+    "color": 6,
+    "bagtype": 0,
+    "index": 18,
+    "special_type": 0,
+    "time": 0,
+    "effects": "",
+    "box_id": 60003,
+    "synthetize_num": 0,
+    "access": [
+      122
+    ],
+    "use_skip": 0,
+    "upper_limit": 1,
+    "uselv": 0,
+    "isani": 0,
+    "star": 0,
+    "race": 0,
+    "img": "wp_icon_10009",
+    "ico": "wp_icon_10009",
+    "intr": {
+      "key": "itemdesc_60003",
+      "text": "可以获得一套5星装备"
+    },
+    "sale": [],
+    "synthetize_deplete": [],
+    "tipstxt": {
+      "key": "itemtipstxt_60003",
+      "text": "5星套装宝箱不足"
+    }
   }
 ]

bin/json/game_shop.json

@@ -63,10 +63,27 @@
     ],
     "rtype": 2,
     "rtime": 1,
-    "rnum": -1,
+    "rnum": 5,
-    "rneed": [],
+    "rneed": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 20
+      }
+    ],
     "shopitem": [
-      10004
+      20001,
+      20002,
+      20003,
+      20004,
+      20005,
+      20006,
+      20007,
+      20008,
+      20009,
+      20010,
+      20011,
+      20012
     ]
   },
   {