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

assets/script/game/module/guide/Guide.ts

@@ -116,6 +116,7 @@ export default class Guide extends cc.Component {
             this.targetNode.getComponent(cc.Button).clickEvents[0].emit([]);
         }
         if (this.event_name) {
+            //event_guide_1_2 (1_2为新手引导的id)
             mk.event.emit(this.event_name);
         }
         if (this.crtGuide.lag_next > 0) {