Merge branch 'master' into qq

# Conflicts:
#	assets/scripts/levelHome/LevelHome.js

assets/scripts/game/HomeGuide.js

@@ -454,7 +454,7 @@ cc.Class({
         let unLockStatus3 = GameGlobal.signCount > 0;
         if (unLockStatus1 && unLockStatus2) {
             if (unLockStatus3) {
-                for(let i = 1; i < 34; i++) {
+                for(let i = 1; i < 35; i++) {
                     let state = `state${i}`;
                     if (this.guideState[state] != undefined) {
                         this.guideState[state].pass = 1;

assets/scripts/levelHome/LevelHome.js

@@ -303,7 +303,9 @@ cc.Class({
         let unLockStatus1 = GameModule.userInfo.buildingLevel >= 25;
         let unLockStatus2 = GameModule.userInfo.buyStarCount > 0;
         if (!GameGlobal.isSignAward && unLockStatus1 && unLockStatus2) {
-            GameModule.homeGuide.getComponent('HomeGuide').handleGuideStateNext('state31', 'state34');
+            if (GameGlobal.signCount == 0) {
+                GameModule.homeGuide.getComponent('HomeGuide').handleGuideStateNext('state31', 'state34');
+            }
             AlertManager.showSignInAlert();
         }
     },

settings/builder.json

@@ -30,7 +30,7 @@
   "packageName": "org.cocos2d.taptapstar",
   "privateKey": "",
   "qqplay": {
-    "REMOTE_SERVER_ROOT": "https://pub.dwstatic.com/wxgame/taptapstar_qq_test",
+    "REMOTE_SERVER_ROOT": "https://pub.dwstatic.com/wxgame/taptapstar_qq",
     "orientation": "portrait"
   },
   "startScene": "6d3c479f-cf4e-43d2-8b48-74bd4f57b5df",