Merge branch 'master' into datasheet

assets/scene/game.fire

@@ -41,8 +41,8 @@
     },
     "_scale": {
       "__type__": "cc.Vec3",
-      "x": 0.3013376124437781,
-      "y": 0.3013376124437781,
+      "x": 0.3452568070187351,
+      "y": 0.3452568070187351,
       "z": 1
     },
     "_quat": {
@@ -739,7 +739,7 @@
     "_skewY": 0,
     "_zIndex": 0,
     "groupIndex": 0,
-    "_id": "c0cwJhBDBJkJNuYShWvPBf"
+    "_id": "21n8vmMzFE35h6b60mx+Sh"
   },
   {
     "__type__": "cc.Label",
@@ -764,7 +764,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "54WslSBpxAV5JDwMsGFDh6"
+    "_id": "43b9Q/ZABNwbCSOoMrtRP0"
   },
   {
     "__type__": "cc.LabelOutline",
@@ -782,7 +782,7 @@
       "a": 255
     },
     "_width": 3,
-    "_id": "83nf7fNS1HjKaUSmXkFM+k"
+    "_id": "3cMIWIAihG1qtiweMtHjgl"
   },
   {
     "__type__": "cc.RichText",
@@ -1837,7 +1837,7 @@
     "_skewY": 0,
     "_zIndex": 0,
     "groupIndex": 0,
-    "_id": "80/w4Tl0dDZZpgp/FvU7eG"
+    "_id": "6eLsoDlDxBka384ixhFoG7"
   },
   {
     "__type__": "cc.Label",
@@ -1862,7 +1862,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "d7BUfoNFdMO4o/7z9O98BG"
+    "_id": "aajK9hkAlF7ZMzTN4jzMI6"
   },
   {
     "__type__": "cc.RichText",
@@ -2282,7 +2282,7 @@
     "_skewY": 0,
     "_zIndex": 0,
     "groupIndex": 0,
-    "_id": "73N9swT55PB7HBuyG2HYuZ"
+    "_id": "62hHNxk6dOnL2v0a9UB1Q4"
   },
   {
     "__type__": "cc.Label",
@@ -2307,7 +2307,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "c0peBBtAFNL5pltl0RkTlR"
+    "_id": "32Z80YuIBN35CewFp2T0Xe"
   },
   {
     "__type__": "cc.RichText",
@@ -3225,7 +3225,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "ae1df82f-6b20-4353-9c07-da5e092bc028"
+      "__uuid__": "b3015ed3-2173-403a-8fdd-361f472ed2eb"
     },
     "_type": 1,
     "_sizeMode": 0,

assets/scripts/star/StarHandbookDesc.js

@@ -46,23 +46,25 @@ cc.Class({
         let star = Global.BuildingManager.getStarInfo(starInfo.starId);
         this.nameLabel.string = star.name;
 
-        let roomName = Global.BuildingManager.getRoomName(star.roomId);
-        if (roomName) {
-            var descString = `需要 开启${roomName}`;
-        }
-
-        let buyStarCount = GameModule.userInfo.buyStarCount;
-        let needStarCount = starInfo.itemCount;
-        if (needStarCount > 0) {
-            descString += `\n需要 ${star.desc}`;
-        } else {
-
-        }
-
-        if (descString) {
-            this.conditionLabel.string = descString;
+        if (star.starDesc) {
+            this.conditionLabel.string = star.starDesc;
         } else {
-            this.conditionLabel.string = '';
+            let roomName = Global.BuildingManager.getRoomName(star.roomId);
+            if (roomName) {
+                var descString = `需要 开启${roomName}`;
+            }
+
+            let buyStarCount = GameModule.userInfo.buyStarCount;
+            let needStarCount = starInfo.itemCount;
+            if (needStarCount > 0) {
+                descString += `\n需要 ${star.desc}`;
+            }
+
+            if (descString) {
+                this.conditionLabel.string = descString;
+            } else {
+                this.conditionLabel.string = '';
+            }
         }
 
         this.countLabel.string = `${starInfo.starCount}人`;

assets/scripts/star/StarHandbookItem.js

@@ -75,9 +75,9 @@ cc.Class({
     },
 
     showStarDesc() {
-        if (this.isUnlocked) {
-            GameEvent.fire('show_star_desc', this.starInfo);
-        }
+        // if (this.isUnlocked) {
+        GameEvent.fire('show_star_desc', this.starInfo);
+        // }
     },
 
     starEnterRoom(starId) {

assets/scripts/star/StarItem.js

@@ -253,6 +253,7 @@ cc.Class({
             this.starIconBlackBg.active = false;
         } else {
             this.freeBuyStarNode.active = false;
+            this.starUseBtn.node.active = true;
             this.starUseTitleRichText.node.active = false;
             this.starUseBtn.interactable = false;
             this.starUserSprite.spriteFrame = this.lockedSpriteFrame;

assets/scripts/utils/ADVideo.js

@@ -15,9 +15,9 @@ class ADVideo {
         /// 默认是加载成功的 啦
         Global._adVideoState = ADVideoLoadState.success;
         this.videoAd = videoAd;
-
         videoAd.load()
             .then(() => {
+                this.isFirstLoad = false;
                 Global._adVideoState = ADVideoLoadState.success;
                 GameEvent.fire(GameNotificationKey.AdUpdateStateNotification, ADVideoLoadState.success);
                 console.log('视频加载成功');
@@ -28,7 +28,8 @@ class ADVideo {
                 // } else {
                 //     Global.commonAlert.showCommonErrorAlert('获取视频失败');
                 // }
-             this.handelVideoErr(err, false);
+             this.handelVideoErr(err);
+             this.isFirstLoad = false;
         });
 
         // videoAd.onLoad(() => {
@@ -38,9 +39,9 @@ class ADVideo {
         //     console.log('视频加载成功');
         // });
 
-        //处理获取视频错误
+        // 处理获取视频错误
         videoAd.onError( (res) => {
-            this.handelVideoErr(res, true);
+            this.handelVideoErr(res);
         });
 
         
@@ -81,15 +82,15 @@ class ADVideo {
                     Global.commonAlert.showCommonErrorAlert('视频正在播放请不要重复点击~~');
                     return;
                 } else {
-                    this.handelVideoErr(err, true);
+                    this.handelVideoErr(err);
                 }
         });
     }
 
-    handelVideoErr(res, isShow) {
-        if (isShow) {
-            Global.commonAlert.showCommonErrorAlert('获取视频失败');
-        } 
+    handelVideoErr(res) {
+        // if (isShow) {
+        //     Global.commonAlert.showCommonErrorAlert('获取视频失败');
+        // } 
         Global._adVideoState = ADVideoLoadState.fail;
         console.log('获取视频失败 fa' + res.errMsg);
         GameEvent.fire(GameNotificationKey.AdUpdateStateNotification, ADVideoLoadState.fail);

assets/scripts/utils/Global.js

@@ -12,9 +12,9 @@ window.Global = {
     // 建筑管理
     BuildingManager: BuildingManager.instance,
 
-    debug: true,
+    debug: false,
 
-    ver: 119, //游戏版本号发版时需要核对
+    ver: 120, //游戏版本号发版时需要核对
     
     isCheck: false,
 

assets/textures/levelHome/levelHome_store_discount.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "cdce9524-91fa-469e-9002-9449858c44ce",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "levelHome_store_discount": {
+      "ver": "1.0.3",
+      "uuid": "b3015ed3-2173-403a-8fdd-361f472ed2eb",
+      "rawTextureUuid": "cdce9524-91fa-469e-9002-9449858c44ce",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 100,
+      "height": 74,
+      "rawWidth": 100,
+      "rawHeight": 74,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

settings/builder.json

@@ -37,11 +37,11 @@
   "title": "taptapstar",
   "webOrientation": "auto",
   "wechatgame": {
-    "REMOTE_SERVER_ROOT": "https://pub.dwstatic.com/wxgame/taptapstar_test",
+    "REMOTE_SERVER_ROOT": "https://pub.dwstatic.com/wxgame/taptapstar",
     "appid": "wx36581990a2e76fba",
     "isSubdomain": false,
     "orientation": "portrait",
-    "subContext": ""
+    "subContext": "wechatgame-subcontext"
   },
   "xxteaKey": "7480184a-3b45-4d",
   "zipCompressJs": true

taptapstarSubGame/assets/Texture.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "d783b118-2557-432f-820e-ff22acfd6470",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}