Merge branch 'master' of https://git.17pkmj.com:3000/sunhengwei/xmmg_1

配置表/总json/package.json

@@ -255,6 +255,13 @@
         {"id":1300010008,"name":"永久卡","farmType":5,"itemType":3,"mType":0,"sType":0,"mostValue":-1,"image_1":"","show":0},
         {"id":24001001,"name":"升级道具","farmType":5,"itemType":3,"mType":0,"sType":0,"mostValue":999,"image_1":"icon_caipusp","show":1},
         {"id":1200010001,"name":"阳光","farmType":5,"itemType":3,"mType":0,"sType":0,"mostValue":999,"image_1":"icon_taiyang80X80","show":1},
-        {"id":1200010002,"name":"阳光","farmType":5,"itemType":3,"mType":0,"sType":0,"mostValue":999,"image_1":"icon_choujiangquan80X80","show":1}
+        {"id":1200010002,"name":"抽奖券","farmType":5,"itemType":3,"mType":0,"sType":0,"mostValue":999,"image_1":"icon_choujiangquan80X80","show":1},
+        {"id":1500010003,"name":"铲子","farmType":5,"itemType":3,"mType":0,"sType":0,"mostValue":999,"image_1":"icon_chanzi","show":1},
+        {"id":1500010004,"name":"叉子","farmType":5,"itemType":3,"mType":0,"sType":0,"mostValue":999,"image_1":"icon_chazi","show":1},
+        {"id":1500010005,"name":"刀具","farmType":5,"itemType":3,"mType":0,"sType":0,"mostValue":999,"image_1":"icon_dao","show":1},
+        {"id":1500010006,"name":"勺子","farmType":5,"itemType":3,"mType":0,"sType":0,"mostValue":999,"image_1":"icon_shaozi","show":1},
+        {"id":1500010007,"name":"大碗","farmType":5,"itemType":3,"mType":0,"sType":0,"mostValue":999,"image_1":"icon_dawan","show":1},
+        {"id":1500010008,"name":"盆","farmType":5,"itemType":3,"mType":0,"sType":0,"mostValue":999,"image_1":"icon_peng","show":1},
+        {"id":1500010009,"name":"铁锅","farmType":5,"itemType":3,"mType":0,"sType":0,"mostValue":999,"image_1":"icon_tguo","show":1}
     ]
 }