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

.gitignore

@@ -26,7 +26,6 @@ pb.bat
 cmd/v2/.cache.meta
 cmd/v2/my.db
 .idea/
-bin/
 bin/cross.json
 bin/gm.json
 bin/cmd

bin/json/game_breakingbad.json

@@ -0,0 +1,53 @@
+[
+  {
+    "delicacies": "99999",
+    "recipe": [],
+    "Type": 1,
+    "flame": 1,
+    "unlockreward": {
+      "a": "attr",
+      "t": "diamond",
+      "n": 1
+    }
+  },
+  {
+    "delicacies": "10011",
+    "recipe": [
+      {
+        "a": "1001",
+        "n": 5
+      },
+      {
+        "a": "1003",
+        "n": 20
+      },
+      {
+        "a": "1004",
+        "n": 10
+      }
+    ],
+    "Type": 2,
+    "flame": 5,
+    "unlockreward": {
+      "a": "attr",
+      "t": "diamond",
+      "n": 10
+    }
+  },
+  {
+    "delicacies": "10012",
+    "recipe": [
+      {
+        "a": "1001",
+        "n": 20
+      }
+    ],
+    "Type": 2,
+    "flame": 3,
+    "unlockreward": {
+      "a": "attr",
+      "t": "diamond",
+      "n": 5
+    }
+  }
+]