修改发布

assets/resources/prefabs/store/storeSmaliItem.prefab

@@ -23,24 +23,24 @@
         "__id__": 6
       },
       {
-        "__id__": 14
+        "__id__": 16
       },
       {
-        "__id__": 22
+        "__id__": 24
       },
       {
-        "__id__": 30
+        "__id__": 32
       }
     ],
     "_active": true,
     "_level": 1,
     "_components": [
       {
-        "__id__": 44
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 45
+      "__id__": 47
     },
     "_opacity": 255,
     "_color": {
@@ -179,7 +179,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "f7KqXGsGxEgazD0o3Ixfhg"
+    "_id": "52av7YleFF558Xgj7AyQmc"
   },
   {
     "__type__": "cc.Widget",
@@ -206,7 +206,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 280,
     "_originalHeight": 306,
-    "_id": "24qYg4bKRGE4ml3jCeJ65s"
+    "_id": "4e2XjsSVdAgqYWojDnu+Xr"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -231,14 +231,18 @@
         "__id__": 7
       },
       {
-        "__id__": 10
+        "__id__": 11
       }
     ],
     "_active": false,
     "_level": 2,
-    "_components": [],
+    "_components": [
+      {
+        "__id__": 14
+      }
+    ],
     "_prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "_opacity": 255,
     "_color": {
@@ -298,10 +302,13 @@
     "_components": [
       {
         "__id__": 8
+      },
+      {
+        "__id__": 9
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 10
     },
     "_opacity": 255,
     "_color": {
@@ -323,8 +330,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -72,
-      "y": 44,
+      "x": -78,
+      "y": 48,
       "z": 0
     },
     "_scale": {
@@ -374,7 +381,34 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "63Gy4KJ7NHMK5DZLsJDXe1"
+    "_id": "ffG7I4bFBEQ4PaqS3t4UFw"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 7
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 9,
+    "_left": -53.5,
+    "_right": 0,
+    "_top": -10.5,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": "29t6Xfj7hIyItvbTVZwaZq"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -399,11 +433,11 @@
     "_level": 3,
     "_components": [
       {
-        "__id__": 11
+        "__id__": 12
       }
     ],
     "_prefab": {
-      "__id__": 12
+      "__id__": 13
     },
     "_opacity": 255,
     "_color": {
@@ -455,7 +489,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 10
+      "__id__": 11
     },
     "_enabled": true,
     "_srcBlendFactor": 770,
@@ -476,7 +510,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "9dl5ihapBGs5bzwmJoAyG7"
+    "_id": "6by6NHmedAZ51enrDPo0kl"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -490,6 +524,33 @@
     "sync": false
   },
   {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 6
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 1,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": "0ccOW38rNOu5u2nWzv67PT"
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -509,17 +570,17 @@
     },
     "_children": [
       {
-        "__id__": 15
+        "__id__": 17
       },
       {
-        "__id__": 18
+        "__id__": 20
       }
     ],
     "_active": false,
     "_level": 2,
     "_components": [],
     "_prefab": {
-      "__id__": 21
+      "__id__": 23
     },
     "_opacity": 255,
     "_color": {
@@ -571,18 +632,18 @@
     "_name": "label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 14
+      "__id__": 16
     },
     "_children": [],
     "_active": true,
     "_level": 3,
     "_components": [
       {
-        "__id__": 16
+        "__id__": 18
       }
     ],
     "_prefab": {
-      "__id__": 17
+      "__id__": 19
     },
     "_opacity": 255,
     "_color": {
@@ -634,7 +695,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 17
     },
     "_enabled": true,
     "_srcBlendFactor": 1,
@@ -652,7 +713,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "80H49go0VKbpvDswwt092w"
+    "_id": "c6zM7QItJK2JG5a/P7sp5o"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -670,18 +731,18 @@
     "_name": "800310",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 14
+      "__id__": 16
     },
     "_children": [],
     "_active": true,
     "_level": 3,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 21
       }
     ],
     "_prefab": {
-      "__id__": 20
+      "__id__": 22
     },
     "_opacity": 255,
     "_color": {
@@ -733,7 +794,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 20
     },
     "_enabled": true,
     "_srcBlendFactor": 770,
@@ -754,7 +815,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "30tAfNaepIEaE8Zq6uTUsV"
+    "_id": "adIn8kBZ9Aqbe3LSHvaqIM"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -787,17 +848,17 @@
     },
     "_children": [
       {
-        "__id__": 23
+        "__id__": 25
       },
       {
-        "__id__": 26
+        "__id__": 28
       }
     ],
     "_active": true,
     "_level": 2,
     "_components": [],
     "_prefab": {
-      "__id__": 29
+      "__id__": 31
     },
     "_opacity": 255,
     "_color": {
@@ -849,18 +910,18 @@
     "_name": "quest_diamond",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 22
+      "__id__": 24
     },
     "_children": [],
     "_active": true,
     "_level": 3,
     "_components": [
       {
-        "__id__": 24
+        "__id__": 26
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 27
     },
     "_opacity": 255,
     "_color": {
@@ -912,7 +973,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 23
+      "__id__": 25
     },
     "_enabled": true,
     "_srcBlendFactor": 770,
@@ -933,7 +994,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "607q6pA+9B4pnzlYA3C6X4"
+    "_id": "43pkrn24tEorG6wdNu5Mg1"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -951,18 +1012,18 @@
     "_name": "label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 22
+      "__id__": 24
     },
     "_children": [],
     "_active": true,
     "_level": 3,
     "_components": [
       {
-        "__id__": 27
+        "__id__": 29
       }
     ],
     "_prefab": {
-      "__id__": 28
+      "__id__": 30
     },
     "_opacity": 255,
     "_color": {
@@ -1014,7 +1075,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 26
+      "__id__": 28
     },
     "_enabled": true,
     "_srcBlendFactor": 1,
@@ -1032,7 +1093,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "d23HUmGFhKdZLL36YrrA+X"
+    "_id": "eeFGwAs+hEr6SFOSkAeSvn"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1065,24 +1126,24 @@
     },
     "_children": [
       {
-        "__id__": 31
+        "__id__": 33
       },
       {
-        "__id__": 34
+        "__id__": 36
       }
     ],
     "_active": true,
     "_level": 2,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 42
       },
       {
-        "__id__": 42
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 45
     },
     "_opacity": 255,
     "_color": {
@@ -1134,18 +1195,18 @@
     "_name": "store_blue_btn",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 30
+      "__id__": 32
     },
     "_children": [],
     "_active": true,
     "_level": 3,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 34
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 35
     },
     "_opacity": 255,
     "_color": {
@@ -1197,7 +1258,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 31
+      "__id__": 33
     },
     "_enabled": true,
     "_srcBlendFactor": 770,
@@ -1218,7 +1279,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "e7qkbTDIBArqAg5lRB/tsv"
+    "_id": "5ck9JgKsVKXJurPucE+rAf"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1236,22 +1297,22 @@
     "_name": "richtext",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 30
+      "__id__": 32
     },
     "_children": [
       {
-        "__id__": 35
+        "__id__": 37
       }
     ],
     "_active": true,
     "_level": 3,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 39
+      "__id__": 41
     },
     "_opacity": 255,
     "_color": {
@@ -1303,18 +1364,18 @@
     "_name": "RICHTEXT_CHILD",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 34
+      "__id__": 36
     },
     "_children": [],
     "_active": true,
     "_level": 4,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 38
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 39
     },
     "_opacity": 255,
     "_color": {
@@ -1336,8 +1397,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -30,
-      "y": -16,
+      "x": 0,
+      "y": 0,
       "z": 0
     },
     "_scale": {
@@ -1366,7 +1427,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 35
+      "__id__": 37
     },
     "_enabled": true,
     "_srcBlendFactor": 1,
@@ -1384,7 +1445,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "f37UuyPnFET44X9hFhUcn7"
+    "_id": "4ehtadHr5Ce5yjNLnH+Afu"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1394,7 +1455,7 @@
     "asset": {
       "__uuid__": "f9dbb66f-b5c4-49fd-b5d2-d02c923ab1b3"
     },
-    "fileId": "b3ShWOt3hEuLafblQfALc8",
+    "fileId": "2c5gAV+rhMEK3RPQwZvurE",
     "sync": false
   },
   {
@@ -1402,7 +1463,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 34
+      "__id__": 36
     },
     "_enabled": true,
     "_N$string": "<color=#ffffff>分享</c>",
@@ -1415,7 +1476,7 @@
       "__uuid__": "9a199f9b-2e79-467b-85f6-b6ebe5f54f18"
     },
     "_N$handleTouchEvent": true,
-    "_id": "cea/M60hhJjbK/qpYMW6Ux"
+    "_id": "17kdbB5BJIxYugF5G5vrco"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1433,7 +1494,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 32
     },
     "_enabled": true,
     "transition": 1,
@@ -1455,7 +1516,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 41
+        "__id__": 43
       }
     ],
     "_N$interactable": true,
@@ -1481,9 +1542,9 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 31
+      "__id__": 33
     },
-    "_id": "19DFvJtCNOQ4RM8eCbljPI"
+    "_id": "68TuS47btNjpX/JzeTT+8X"
   },
   {
     "__type__": "cc.ClickEvent",
@@ -1499,7 +1560,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 32
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1519,7 +1580,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 0,
     "_originalHeight": 0,
-    "_id": "7bfvLzQGBBKIoe2LOYx5OF"
+    "_id": "81dOroMH5LSIhCJBbLeRas"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1544,39 +1605,39 @@
       "__id__": 6
     },
     "diamondSprite": {
-      "__id__": 11
+      "__id__": 12
     },
     "diamondDoubleSprite": {
       "__id__": 8
     },
     "coinNode": {
-      "__id__": 14
+      "__id__": 16
     },
     "coinLabel": {
-      "__id__": 16
+      "__id__": 18
     },
     "coinSprite": {
-      "__id__": 19
+      "__id__": 21
     },
     "adNode": {
-      "__id__": 22
+      "__id__": 24
     },
     "adSprite": {
-      "__id__": 24
+      "__id__": 26
     },
     "adLabel": {
-      "__id__": 27
+      "__id__": 29
     },
     "buyBtn": {
-      "__id__": 40
+      "__id__": 42
     },
     "buyRichText": {
-      "__id__": 38
+      "__id__": 40
     },
     "buySprite": {
-      "__id__": 32
+      "__id__": 34
     },
-    "_id": "59Cp2dwKtBIreelOcqf4/Q"
+    "_id": "80aRNSrpFBKZoE1HZdws93"
   },
   {
     "__type__": "cc.PrefabInfo",

assets/scripts/game/Game.js

@@ -157,6 +157,7 @@ cc.Class({
     _initSocketMng() {
         let testUrl = 'wss://test-message-taptap.duowan.com/connect';
         let pUrl = 'wss://message-allstar.duowan.com/connect';
+        // let testUrl = 'wss://new-message-taptap.duowan.com/connect';
         let socketUrl = Global.debug ? testUrl : pUrl;
         // let socketUrl = 'ws://172.16.15.196:9099/connect';
 

assets/scripts/game/GameShop.js

@@ -113,18 +113,14 @@ cc.Class({
     /// 处理商品的信息流信息
     handleShpDataToMessageList(shopData) {
         /// 如果有时间并且有cd剩余时间
+        let desc = shop.infoDesc + '';
         if (shop.minuteTime > 0 && shop.cdTime > 0) {
-            let desc = shop.desc + '';
-            let stringArr = desc.split('n');
-            if (stringArr.length > 1) {
-                desc = stringArr[0] + stringArr[1];
-            }
             let shopObjc = {'cdTime': shop.cdTime * 1000, 'desc': desc, 'icon': shop.icon, 'sId': shopData.shopId, 'type': 1};
             Global._timeInformations.push(shopObjc);
             GameEvent.fire(GameNotificationKey.GameUpdateMessageList, 1, true);
             /// 说明不是需要时间cd的 
         } else {
-            let shopObjc = {'cdTime': -6 * 1000, 'desc': '获得' + shop.name, 'icon': shop.icon, 'sId': shopData.shopId, 'type': 1};
+            let shopObjc = {'cdTime': -6 * 1000, 'desc': desc, 'icon': shop.icon, 'sId': shopData.shopId, 'type': 1};
             Global._fixInformations.push(shopObjc);
             GameEvent.fire(GameNotificationKey.GameUpdateMessageList, 1);
         }

assets/scripts/net/Api.js

@@ -324,6 +324,8 @@ class Api {
      */
     static requestUrl(targetUrl) {
         let host = Global.debug ? 'https://test-api-taptap.duowan.com' : 'https://api-taptap.duowan.com';
+        //  let host = 'https://new-api-taptap.duowan.com';
+         
         // let host = Global.debug ? 'http://172.16.15.196:8888' : 'https://api-allstar.duowan.com';
         return host + targetUrl;
     }

assets/scripts/utils/Global.js

@@ -13,7 +13,7 @@ window.Global = {
     BuildingManager: BuildingManager.instance,
 
     debug: true,
-    ver: 102,   //游戏版本号发版时需要核对
+    ver: 104,   //游戏版本号发版时需要核对
 
     isCheck: false,
 

settings/builder.json

@@ -29,7 +29,7 @@
   "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",