Merge branch 'master' of http://git.mokasz.com/zouyong/mk_framework

assets/resources/module/pigBank/pigBank.prefab

@@ -827,9 +827,9 @@
       "__id__": 16
     },
     "_enabled": true,
-    "panel_name": "help",
+    "panel_name": "module/help/help",
     "open_type": 0,
-    "panel_type": 2,
+    "transition_type": 0,
     "onComplete": [
       {
         "__id__": 21
@@ -2293,6 +2293,7 @@
       "b": 0,
       "a": 120
     },
+    "design_block_node": null,
     "bClickClose": false,
     "_id": ""
   },