Merge branch 'dev' of http://svn.ouj.com:3000/DWG/taptapstar into dev

assets/scripts/game/Game.js

@@ -151,7 +151,6 @@ cc.Class({
         // GameModule.homeGuide.getComponent('HomeGuide').handleState('state31');
         GameModule.homeGuide.getComponent('HomeGuide').handleGuideStateNext('state29', 'state31');
         GameModule.homeGuide.on('Fire_state29', this.finishState29, this);
-        GameModule.homeGuide.on('Fire_state31', this.handleQuestPopup, this);
 
         if (this.homeGuide.guideState.state7.pass || this.homeGuide.guideState.state11.pass) {
             GameModule.homeGuide.getComponent('HomeGuide').handleState('state13');

assets/scripts/game/HomeSideCtrl.js

@@ -2,6 +2,7 @@ const AlertManager = require('../utils/AlertManager');
 const GameRedDot = require('../utils/GameEnum').GameRedDot;
 const GameNotificationKey = require('../utils/GameEnum').GameNotificationKey;
 const DWTool = require('../utils/DWTool');
+const GameModule = require("../utils/GameModule");
 
 cc.Class({
     extends: cc.Component,
@@ -100,6 +101,8 @@ cc.Class({
 
         //7天登录奖励完成隐藏按钮
         GameEvent.on(GameNotificationKey.LoginRewardGainFinish, this, this._hideLoginReward);
+
+        GameModule.homeGuide.on('Fire_state31', this.handleQuestPopup, this);
     },
 
     onDestroy() {

assets/scripts/net/WeChat.js

@@ -68,7 +68,7 @@ class WeChat {
     login(cb) {
 
         this.cb = cb || function () { }
-        if (!CC_WECHATGAME || window.tt == undefined) {
+        if (!CC_WECHATGAME && window.tt == undefined) {
             GameGlobal.user = {
                 uid: 1,
                 token: 'lucifer_test_token',