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

bin/json/game_worldtask.json

@@ -48,7 +48,7 @@
     "task_display": "新剧情文本10101",
     "npc": [
       "scenes_ boundary_02",
-      "邦尼兔组件名",
+      "邦尼兔组件名入场",
       "150"
     ],
     "getafter_event": [
@@ -56,7 +56,7 @@
       100002
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [],
     "day": "",