修改商城UI

assets/resources/prefabs/draw/drawStarSuccss.prefab

@@ -946,7 +946,7 @@
     "asset": {
       "__uuid__": "f72cc06e-a339-494b-9401-6773a18c914f"
     },
-    "fileId": "eakmx+/I9LfZZvY53pKWRO",
+    "fileId": "386WgjP3lKN44BqKavp/gM",
     "sync": false
   },
   {
@@ -1045,7 +1045,7 @@
     "asset": {
       "__uuid__": "f72cc06e-a339-494b-9401-6773a18c914f"
     },
-    "fileId": "ddPrF3bRJGw7NOqjRl22IL",
+    "fileId": "54VsD23B5OD5imC4du2fOH",
     "sync": false
   },
   {

assets/resources/prefabs/precedence/store_content.prefab

@@ -170,7 +170,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "60xcduMRtIGpz96wtQ/ya9"
+    "_id": ""
   },
   {
     "__type__": "cc.BlockInputEvents",
@@ -180,7 +180,7 @@
       "__id__": 2
     },
     "_enabled": true,
-    "_id": "d9iQAONcVOk4R/k9iUQqqu"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -375,7 +375,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "9ci+bH3xlLtqHn3bhW5JXy"
+    "_id": ""
   },
   {
     "__type__": "cc.Widget",
@@ -402,7 +402,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 700,
     "_originalHeight": 992,
-    "_id": "b9EEEol0RFnrhJvvajzAWr"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -504,7 +504,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "d51Ywkl5FLkKhIkIAIdujf"
+    "_id": ""
   },
   {
     "__type__": "cc.Widget",
@@ -531,7 +531,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 0,
     "_originalHeight": 0,
-    "_id": "8cZ32EqQFDdZURoEKkTUrV"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -770,7 +770,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "faOrofHSlMgKAJxZztXVLx"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -780,7 +780,7 @@
     "asset": {
       "__uuid__": "cc01c6a6-0d71-48e4-a457-4519fcdfb398"
     },
-    "fileId": "bcrC/osCZFzJZExDpTAqxz",
+    "fileId": "48XuETyUtCColX/aGzSzpF",
     "sync": false
   },
   {
@@ -801,7 +801,7 @@
       "__uuid__": "9a199f9b-2e79-467b-85f6-b6ebe5f54f18"
     },
     "_N$handleTouchEvent": true,
-    "_id": "44GB4iMPxH7YoSAC4IibqV"
+    "_id": ""
   },
   {
     "__type__": "cc.Widget",
@@ -828,7 +828,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 0,
     "_originalHeight": 0,
-    "_id": "3eXUNkx7lNRKbdIIcScpNr"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -867,7 +867,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "38BFPdl0VGGL8McaSOSUnc"
+    "_id": ""
   },
   {
     "__type__": "cc.Widget",
@@ -894,7 +894,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 0,
     "_originalHeight": 0,
-    "_id": "63uwINjN9O7a5rjO8DCwdr"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -949,7 +949,7 @@
     "_position": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 500,
+      "y": 524,
       "z": 0
     },
     "_scale": {
@@ -999,7 +999,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "53C86Fuo5KSqsl/9GcKgLT"
+    "_id": ""
   },
   {
     "__type__": "cc.Widget",
@@ -1014,7 +1014,7 @@
     "_alignFlags": 1,
     "_left": 0,
     "_right": 0,
-    "_top": -103,
+    "_top": -127,
     "_bottom": 845.5,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
@@ -1026,7 +1026,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 0,
     "_originalHeight": 198,
-    "_id": "30q42rgS1CkrOcgr/4Mz4K"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1274,7 +1274,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "3f3JUZDAtDJrWC2sVLV5t6"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1354,7 +1354,7 @@
     "_N$target": {
       "__id__": 31
     },
-    "_id": "63P6y5YZBM3KzwF9ToM678"
+    "_id": ""
   },
   {
     "__type__": "cc.ClickEvent",
@@ -1535,7 +1535,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "3cmeFy/h9OR7fdl7YS+Z/X"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1637,7 +1637,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "5c8YlSpm5JJL4MIuAQ329a"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1717,7 +1717,7 @@
     "_N$target": {
       "__id__": 38
     },
-    "_id": "34LtH01rtO16kIUvwHtBPn"
+    "_id": ""
   },
   {
     "__type__": "cc.ClickEvent",
@@ -1898,7 +1898,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "61v1MxNMFCPLqnRMnhFM5W"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2000,7 +2000,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "78TN1okVZD+I2MTvT89g0B"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2080,7 +2080,7 @@
     "_N$target": {
       "__id__": 48
     },
-    "_id": "daBkDerdlL8KPQ9UaQfC3J"
+    "_id": ""
   },
   {
     "__type__": "cc.ClickEvent",
@@ -2258,7 +2258,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "c7ZLCqJ4lDJLF+J+ThIm8X"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2338,7 +2338,7 @@
     "_N$target": {
       "__id__": 58
     },
-    "_id": "b4ZBY5x7RCN7l1WSuDk5Wb"
+    "_id": ""
   },
   {
     "__type__": "cc.ClickEvent",
@@ -2390,7 +2390,7 @@
     "_N$spacingY": 0,
     "_N$verticalDirection": 1,
     "_N$horizontalDirection": 0,
-    "_id": "71kdHAm5xFFJSNF5+sNMwM"
+    "_id": ""
   },
   {
     "__type__": "cc.Widget",
@@ -2417,7 +2417,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 0,
     "_originalHeight": 0,
-    "_id": "6dwdeahedHNZZ/8fA9sIrj"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2476,7 +2476,7 @@
     "_position": {
       "__type__": "cc.Vec3",
       "x": 316,
-      "y": 530,
+      "y": 494,
       "z": 0
     },
     "_scale": {
@@ -2538,8 +2538,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": 16,
-      "y": -1,
+      "x": 18,
+      "y": -9,
       "z": 0
     },
     "_scale": {
@@ -2589,7 +2589,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "03XF037bZCHaIyN0MIoznZ"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2669,7 +2669,7 @@
     "_N$target": {
       "__id__": 69
     },
-    "_id": "78SERbHAVGwYWKKg6rhmKr"
+    "_id": ""
   },
   {
     "__type__": "cc.ClickEvent",
@@ -2693,7 +2693,7 @@
     "_alignFlags": 33,
     "_left": 0,
     "_right": 2.5,
-    "_top": -91,
+    "_top": -55,
     "_bottom": 0,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
@@ -2705,7 +2705,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 0,
     "_originalHeight": 0,
-    "_id": "0dkakFSG5DDKvbAuRq1mFR"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2954,7 +2954,7 @@
     "_N$spacingY": 10,
     "_N$verticalDirection": 1,
     "_N$horizontalDirection": 0,
-    "_id": "3002UqGlhNepKobVsejXvg"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2982,7 +2982,7 @@
     "_segments": 64,
     "_N$alphaThreshold": 0,
     "_N$inverted": false,
-    "_id": "b2EmED00dBjp+WyKMky5Gb"
+    "_id": ""
   },
   {
     "__type__": "cc.Widget",
@@ -3009,7 +3009,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 690,
     "_originalHeight": 730,
-    "_id": "20f3nD33hLuJduHq0iIHtD"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3030,9 +3030,6 @@
       "__id__": 76
     },
     "_enabled": true,
-    "content": {
-      "__id__": 78
-    },
     "horizontal": false,
     "vertical": true,
     "inertia": true,
@@ -3045,9 +3042,15 @@
       }
     ],
     "cancelInnerEvents": false,
+    "_N$content": {
+      "__id__": 78
+    },
+    "content": {
+      "__id__": 78
+    },
     "_N$horizontalScrollBar": null,
     "_N$verticalScrollBar": null,
-    "_id": "eaz8ixd69L2KJx4+rIKPM/"
+    "_id": ""
   },
   {
     "__type__": "cc.ClickEvent",
@@ -3072,7 +3075,7 @@
     "content": {
       "__id__": 78
     },
-    "_id": "b0Uh2FctxBHKgrzR7CWjtG"
+    "_id": ""
   },
   {
     "__type__": "cc.Widget",
@@ -3099,7 +3102,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 690,
     "_originalHeight": 730,
-    "_id": "e5T8BFPHxMKYwnLqTB5DJH"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3348,7 +3351,7 @@
     "_N$spacingY": 15,
     "_N$verticalDirection": 1,
     "_N$horizontalDirection": 0,
-    "_id": "e1ax5K9a1Me7df55mcUn1I"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3376,7 +3379,7 @@
     "_segments": 64,
     "_N$alphaThreshold": 0,
     "_N$inverted": false,
-    "_id": "0dO9wALYNHRpJCRMco9No0"
+    "_id": ""
   },
   {
     "__type__": "cc.Widget",
@@ -3403,7 +3406,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 690,
     "_originalHeight": 730,
-    "_id": "58c4BCKZJAhohttFm3pIMl"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3424,9 +3427,6 @@
       "__id__": 89
     },
     "_enabled": true,
-    "content": {
-      "__id__": 91
-    },
     "horizontal": false,
     "vertical": true,
     "inertia": true,
@@ -3435,9 +3435,15 @@
     "bounceDuration": 0.23,
     "scrollEvents": [],
     "cancelInnerEvents": true,
+    "_N$content": {
+      "__id__": 91
+    },
+    "content": {
+      "__id__": 91
+    },
     "_N$horizontalScrollBar": null,
     "_N$verticalScrollBar": null,
-    "_id": "00pGBEckZJmpfnrBbA6g/B"
+    "_id": ""
   },
   {
     "__type__": "ec284Gahy1CIYpfWKmpBKnS",
@@ -3453,7 +3459,7 @@
     "content": {
       "__id__": 91
     },
-    "_id": "e8W4AxJH5J74M4kbUqoVAY"
+    "_id": ""
   },
   {
     "__type__": "cc.Widget",
@@ -3480,7 +3486,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 690,
     "_originalHeight": 730,
-    "_id": "8fonpSUa9IHYmmZo/zApCN"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3729,7 +3735,7 @@
     "_N$spacingY": 15,
     "_N$verticalDirection": 1,
     "_N$horizontalDirection": 0,
-    "_id": "5cCnsejdNNEKzfGc2xQW92"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3757,7 +3763,7 @@
     "_segments": 64,
     "_N$alphaThreshold": 0,
     "_N$inverted": false,
-    "_id": "dc8FotewhAk7aH1Q6NKpJW"
+    "_id": ""
   },
   {
     "__type__": "cc.Widget",
@@ -3784,7 +3790,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 690,
     "_originalHeight": 730,
-    "_id": "3eb28P3qFEWaqhSLnfgsYz"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3805,9 +3811,6 @@
       "__id__": 101
     },
     "_enabled": true,
-    "content": {
-      "__id__": 103
-    },
     "horizontal": false,
     "vertical": true,
     "inertia": true,
@@ -3816,9 +3819,15 @@
     "bounceDuration": 0.23,
     "scrollEvents": [],
     "cancelInnerEvents": true,
+    "_N$content": {
+      "__id__": 103
+    },
+    "content": {
+      "__id__": 103
+    },
     "_N$horizontalScrollBar": null,
     "_N$verticalScrollBar": null,
-    "_id": "13CvZB7rBDNoNh813hZRrR"
+    "_id": ""
   },
   {
     "__type__": "b4785MBetlEjKLK9+rZtE+t",
@@ -3834,7 +3843,7 @@
     "content": {
       "__id__": 103
     },
-    "_id": "1c+6ztMfdEVJ/gDbJ4RDma"
+    "_id": ""
   },
   {
     "__type__": "cc.Widget",
@@ -3861,7 +3870,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 690,
     "_originalHeight": 730,
-    "_id": "d8sDZgPD5EKrvXovGqDhSF"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4110,7 +4119,7 @@
     "_N$spacingY": 10,
     "_N$verticalDirection": 1,
     "_N$horizontalDirection": 0,
-    "_id": "d4sQtTm6xKvZB5/IjKyfmv"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4138,7 +4147,7 @@
     "_segments": 64,
     "_N$alphaThreshold": 0,
     "_N$inverted": false,
-    "_id": "521PdXX0NCgYwXWGAISuWM"
+    "_id": ""
   },
   {
     "__type__": "cc.Widget",
@@ -4165,7 +4174,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 690,
     "_originalHeight": 730,
-    "_id": "7f5+QQ2x9NaZTeMdQQ+N+C"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4186,9 +4195,6 @@
       "__id__": 113
     },
     "_enabled": true,
-    "content": {
-      "__id__": 115
-    },
     "horizontal": false,
     "vertical": true,
     "inertia": true,
@@ -4197,9 +4203,15 @@
     "bounceDuration": 0.23,
     "scrollEvents": [],
     "cancelInnerEvents": true,
+    "_N$content": {
+      "__id__": 115
+    },
+    "content": {
+      "__id__": 115
+    },
     "_N$horizontalScrollBar": null,
     "_N$verticalScrollBar": null,
-    "_id": "b7Vk7n/VpB2YFXE3fmQwPS"
+    "_id": ""
   },
   {
     "__type__": "7aa71dArJJIU4tEkreSzlcY",
@@ -4215,7 +4227,7 @@
     "content": {
       "__id__": 115
     },
-    "_id": "07OVVWRhJEgL2cI7LkoGBI"
+    "_id": ""
   },
   {
     "__type__": "cc.Widget",
@@ -4242,7 +4254,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 690,
     "_originalHeight": 730,
-    "_id": "37JCFQBDtMrJL+D+c907ju"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4346,7 +4358,7 @@
       "__id__": 6
     },
     "_tabIndex": 1,
-    "_id": "c0TSYGEr5H25hcFmaZokz9"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",

assets/resources/prefabs/store/storeDiamondItem.prefab

@@ -46,8 +46,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 280,
-      "height": 306
+      "width": 310,
+      "height": 286
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -112,8 +112,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 280,
-      "height": 306
+      "width": 310,
+      "height": 286
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -158,10 +158,10 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "5eaa35a9-1d7c-4116-b455-04f5a813d952"
+      "__uuid__": "9b0430f2-7866-4cab-aa98-b2b2507bb207"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -173,7 +173,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "afS9l4O4FO7LXIsQ/RbOmL"
+    "_id": ""
   },
   {
     "__type__": "cc.Widget",
@@ -200,7 +200,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 280,
     "_originalHeight": 306,
-    "_id": "4euyoAJgVFxbA3nldD1l+i"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -241,8 +241,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 197,
-      "height": 242
+      "width": 243,
+      "height": 253
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -302,7 +302,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "94W0p3x5hJe7GFgx2c7IK1"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -346,8 +346,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 280,
-      "height": 306
+      "width": 310,
+      "height": 286
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -392,7 +392,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "303b4710-a97a-4c5b-85c6-c68cfc1a548f"
+      "__uuid__": "0b307ef2-1b90-4152-a110-42a47e88c325"
     },
     "_type": 0,
     "_sizeMode": 0,
@@ -407,7 +407,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "6cK7HfpTVLwpep6tFKQ9yS"
+    "_id": ""
   },
   {
     "__type__": "cc.Widget",
@@ -434,7 +434,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 280,
     "_originalHeight": 300,
-    "_id": "d2Hd1it+pFFpFhAu34gG59"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -461,7 +461,7 @@
     "selectedSprite": {
       "__id__": 10
     },
-    "_id": "0elGaQmG1JoIZcJvG0VJG8"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",

assets/resources/textures/store/800210.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 1,
-      "offsetY": -14.5,
-      "trimX": 51,
-      "trimY": 42,
-      "width": 130,
-      "height": 155,
-      "rawWidth": 230,
-      "rawHeight": 210,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 164,
+      "height": 108,
+      "rawWidth": 164,
+      "rawHeight": 108,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/textures/store/800220.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 1.5,
-      "offsetY": -19,
-      "trimX": 40,
-      "trimY": 45,
-      "width": 153,
-      "height": 158,
-      "rawWidth": 230,
-      "rawHeight": 210,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 193,
+      "height": 109,
+      "rawWidth": 193,
+      "rawHeight": 109,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/textures/store/800230.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 1,
-      "offsetY": -15,
-      "trimX": 36,
-      "trimY": 37,
-      "width": 160,
-      "height": 166,
-      "rawWidth": 230,
-      "rawHeight": 210,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 194,
+      "height": 121,
+      "rawWidth": 194,
+      "rawHeight": 121,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/textures/store/800240.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 1,
-      "offsetY": -4.5,
-      "trimX": 18,
-      "trimY": 16,
-      "width": 196,
-      "height": 187,
-      "rawWidth": 230,
-      "rawHeight": 210,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 236,
+      "height": 126,
+      "rawWidth": 236,
+      "rawHeight": 126,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/textures/store/800250.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 1.5,
-      "offsetY": -0.5,
-      "trimX": 12,
-      "trimY": 8,
-      "width": 209,
-      "height": 195,
-      "rawWidth": 230,
-      "rawHeight": 210,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 226,
+      "height": 131,
+      "rawWidth": 226,
+      "rawHeight": 131,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/textures/store/800310.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 1.5,
-      "offsetY": -2,
-      "trimX": 26,
-      "trimY": 12,
+      "offsetX": 0.5,
+      "offsetY": 0,
+      "trimX": 25,
+      "trimY": 20,
       "width": 161,
-      "height": 160,
+      "height": 115,
       "rawWidth": 210,
-      "rawHeight": 180,
+      "rawHeight": 155,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/textures/store/800320.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 1.5,
-      "offsetY": -1,
-      "trimX": 18,
-      "trimY": 10,
-      "width": 177,
-      "height": 162,
-      "rawWidth": 210,
-      "rawHeight": 180,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 181,
+      "height": 119,
+      "rawWidth": 181,
+      "rawHeight": 119,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/textures/store/800330.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 1.5,
-      "offsetY": -4,
-      "trimX": 10,
-      "trimY": 16,
-      "width": 193,
-      "height": 156,
-      "rawWidth": 210,
-      "rawHeight": 180,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 196,
+      "height": 129,
+      "rawWidth": 196,
+      "rawHeight": 129,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/textures/store/800340.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 1,
-      "offsetY": 5,
-      "trimX": 3,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
       "trimY": 0,
-      "width": 206,
-      "height": 170,
-      "rawWidth": 210,
-      "rawHeight": 180,
+      "width": 229,
+      "height": 131,
+      "rawWidth": 229,
+      "rawHeight": 131,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/textures/store/store_big_blue.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "a8e267f6-aac7-4e15-b94f-ce6bcb0dce07",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "store_big_blue": {
+      "ver": "1.0.3",
+      "uuid": "14d7bc71-2ae8-4638-ae39-52b49a638984",
+      "rawTextureUuid": "a8e267f6-aac7-4e15-b94f-ce6bcb0dce07",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 230,
+      "height": 60,
+      "rawWidth": 230,
+      "rawHeight": 60,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/textures/store/store_diamond_1.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 2.5,
-      "offsetY": -19,
-      "trimX": 23,
-      "trimY": 45,
-      "width": 197,
-      "height": 242,
-      "rawWidth": 238,
-      "rawHeight": 294,
+      "offsetX": -1.5,
+      "offsetY": -9.5,
+      "trimX": 32,
+      "trimY": 23,
+      "width": 243,
+      "height": 253,
+      "rawWidth": 310,
+      "rawHeight": 280,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/textures/store/store_diamond_2.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 2.5,
-      "offsetY": -15,
-      "trimX": 23,
-      "trimY": 37,
-      "width": 197,
-      "height": 250,
-      "rawWidth": 238,
-      "rawHeight": 294,
+      "offsetX": -1.5,
+      "offsetY": -9.5,
+      "trimX": 32,
+      "trimY": 23,
+      "width": 243,
+      "height": 253,
+      "rawWidth": 310,
+      "rawHeight": 280,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/textures/store/store_diamond_3.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 1.5,
-      "offsetY": -4.5,
-      "trimX": 18,
-      "trimY": 16,
-      "width": 205,
-      "height": 271,
-      "rawWidth": 238,
-      "rawHeight": 294,
+      "offsetX": -2.5,
+      "offsetY": -3,
+      "trimX": 30,
+      "trimY": 10,
+      "width": 245,
+      "height": 266,
+      "rawWidth": 310,
+      "rawHeight": 280,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/textures/store/store_diamond_4.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 2,
-      "offsetY": -0.5,
-      "trimX": 14,
-      "trimY": 8,
-      "width": 214,
-      "height": 279,
-      "rawWidth": 238,
-      "rawHeight": 294,
+      "offsetX": -1.5,
+      "offsetY": -5.5,
+      "trimX": 32,
+      "trimY": 15,
+      "width": 243,
+      "height": 261,
+      "rawWidth": 310,
+      "rawHeight": 280,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/textures/store/store_diamond_d.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": -0.5,
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 151,
-      "height": 145,
-      "rawWidth": 151,
-      "rawHeight": 145,
+      "width": 108,
+      "height": 108,
+      "rawWidth": 109,
+      "rawHeight": 108,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/textures/store/store_selected.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "86c7530d-e031-444d-96c8-b0907b08a3ad",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "store_selected": {
+      "ver": "1.0.3",
+      "uuid": "0b307ef2-1b90-4152-a110-42a47e88c325",
+      "rawTextureUuid": "86c7530d-e031-444d-96c8-b0907b08a3ad",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 310,
+      "height": 280,
+      "rawWidth": 310,
+      "rawHeight": 280,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/textures/store/store_small_bg.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "b34a3d56-5f76-467a-8e15-1be9dd640882",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "store_small_bg": {
+      "ver": "1.0.3",
+      "uuid": "9b0430f2-7866-4cab-aa98-b2b2507bb207",
+      "rawTextureUuid": "b34a3d56-5f76-467a-8e15-1be9dd640882",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 310,
+      "height": 286,
+      "rawWidth": 310,
+      "rawHeight": 286,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/textures/store/store_top_banner.png.meta

@@ -17,10 +17,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 736,
-      "height": 198,
-      "rawWidth": 736,
-      "rawHeight": 198,
+      "width": 737,
+      "height": 211,
+      "rawWidth": 737,
+      "rawHeight": 211,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/scripts/store/StoreBigItem.js

@@ -34,7 +34,7 @@ cc.Class({
         this._index = index;
         this._shopData = data;
 
-        this.subTitleRichText.string = `<color=#2E2E2E>${data.desc}</c>`
+        this.subTitleRichText.string = `<b><color=#2E2E2E>${data.desc}</c></b>`
         this.subTitleRichText.fontSize = fontSize;
         this.useTitleLabel.string = `￥ ${data.price}`;
         let path = './textures/store/800' + data.type;
@@ -72,7 +72,6 @@ cc.Class({
         }).catch((msg) => {
             console.log(msg);
         });
-
     },
 
     /// 初始化推荐商品的订阅个
@@ -81,7 +80,7 @@ cc.Class({
         this._itemDatas = itemDatas;
         this.useTitleLabel.fontSize = 20;
         this.useTitleLabel.string = '订阅\n查看详细内容';
-        this.subTitleRichText.string = `<color=#2E2E2E>${itemDatas[0].desc}</c>`;
+        this.subTitleRichText.string = `<b><color=#2E2E2E>${itemDatas[0].desc}</c></b>`;
         let path = './textures/store/800000';
         let bgPath = './textures/store/800401';
         let titlePath = './textures/store/store_subcript';

assets/scripts/store/StoreCoin.js

@@ -32,11 +32,11 @@ cc.Class({
             this._shops = respondData.shops;
             for (let i = 0; i < this._shops.length; ++ i) {
                 let coinItem = cc.instantiate(this.item);
-                let coinItemWidth = coinItem.width;
-                let coinItemHeight = coinItem.height;
-                let radio = coinItemHeight / coinItemWidth;
+                // let coinItemWidth = coinItem.width;
+                // let coinItemHeight = coinItem.height;
+                // let radio = coinItemHeight / coinItemWidth;
                 coinItem.width = itemWith;
-                coinItem.height = coinItemHeight * radio;
+                // coinItem.height = coinItemHeight * radio;
                 coinItem.getComponent('StoreSmallItem').init(this._shops[i], 3, i);
                 this.content.addChild(coinItem);
                 this._items.push(coinItem);

assets/scripts/store/StoreDiamond.js

@@ -30,11 +30,11 @@ cc.Class({
             this._shops = respondData.shops;
             for (let i = 0; i < this._shops.length; ++ i) {
                 let diamondItem = cc.instantiate(this.item);
-                let diamondItemWidth = diamondItem.width;
-                let diamondItemHeight = diamondItem.height;
-                let radio = diamondItemHeight / diamondItemWidth;
+                // let diamondItemWidth = diamondItem.width;
+                // let diamondItemHeight = diamondItem.height;
+                // let radio = diamondItemHeight / diamondItemWidth;
                 diamondItem.width = itemWith;
-                diamondItem.height = diamondItemHeight * radio;
+                // diamondItem.height = diamondItemHeight * radio;
                 this._shops[i].isBuyDiamond = respondData.isBuyDiamond;
                 diamondItem.getComponent('StoreSmallItem').init(this._shops[i], 2, i);
                 this.content.addChild(diamondItem);

assets/scripts/store/StoreSmallItem.js

@@ -14,20 +14,23 @@ cc.Class({
         diamondNode: cc.Node,
         diamondSprite: cc.Sprite,
         diamondDoubleSprite: cc.Sprite,
+        diamondDiscountLabel: cc.Label,
+        diamondRichText: cc.RichText,
 
         coinNode: cc.Node,
         coinLabel: cc.Label,
         coinSprite: cc.Sprite,
+        coinRicheText: cc.RichText,
 
         adNode: cc.Node,
         adSprite: cc.Sprite,
         adLabel: cc.Label,
+        adTitleRichText: cc.RichText,
 
         buyBtn: cc.Button,
         buyRichText: cc.RichText,
         buySprite: cc.Sprite,
         _adState: 0
-
     },
 
     // LIFE-CYCLE CALLBACKS:
@@ -72,6 +75,8 @@ cc.Class({
                 add = TapTapTool.multiple({'n': GameModule.shop.multiple, 'e': 0}, add);
                 let gold = TapTapTool.multiple(TapTapTool.multiple(add, GameModule.userInfo.perpetualMt), {'e': 0, 'n': 36});
                 this._getGold = gold;
+                let coinString = TapTapTool.parseToString(gold);
+                this.adTitleRichText.string = `<b><outline color=#612716 width=2>${coinString}</outline></b><size=18>`;
             }
             GameEvent.on(GameNotificationKey.AdUpdateStateNotification, this, (adState, callBack) => {
                 /// 说明是技能的关闭状态
@@ -88,6 +93,7 @@ cc.Class({
             /// 如果是砖石
             if (tabIndex == 2) {
                 let path = './textures/store/800' + tabIndex + index + '0';
+                
                 DWTool.loadResSpriteFrame(path).then((spriteFrame) => {
                     this.diamondSprite.spriteFrame= spriteFrame;
                 });
@@ -96,13 +102,28 @@ cc.Class({
                 } else {
                     this.diamondDoubleSprite.node.active = index > 1;
                 }
-
+                
+                if (data.shopId <= 10 && data.shopId >= 6) {
+                    let disCountDiamonds = [100, 800, 3000, 10000];
+                    let diamonds = [200, 1000, 4000, 10000, 20000];
+                    this.diamondRichText.string = `<b><outline color=#612716 width=2>${diamonds[data.shopId - 6]}钻石</outline></b><size=18>`;
+                    /// 如果是获得两百个钻石
+                    if (data.shopId === 6) {
+                        this.diamondDiscountLabel.node.active = false;
+                    } else {
+                        this.diamondDiscountLabel.string = `额外送 ${disCountDiamonds[data.shopId - 7]}钻石`;
+                    }
+                }
             } else {
                 let index = this._shopData.shopId - 11;
                 let path = './textures/store/800' + tabIndex + index + '0';
                 DWTool.loadResSpriteFrame(path).then((spriteFrame) => {
                     this.coinSprite.spriteFrame= spriteFrame;
                 });
+                if (data.shopId >= 12 && data.shopId <= 15) {
+                    let coinArr = ['15分钟', '24小时', '72小时', '144小时'];
+                    this.coinRicheText.string = `<b><outline color=#612716 width=2>${coinArr[data.shopId - 12]}</outline></b><size=18>`;
+                }
             }
         }
         this.updateTime();
@@ -128,15 +149,15 @@ cc.Class({
     updateNormalTitle() {
         if (this._tabIndex == 2) {
             if ( this._adState === 0) {
-                this.adLabel.string = '分享到群\n' + '获得钻石10个';
+                this.adLabel.string = '分享到群获得钻石';
             } else {
-                this.adLabel.string = '播放视频\n' + '获得钻石10个';
+                this.adLabel.string = '播放视频获得钻石';
             }
         } else {
             if ( this._adState === 0) {
-                this.adLabel.string = '分享到群\n' + '获得金币' +  TapTapTool.parseToString(this._getGold);
+                this.adLabel.string = '分享到群获得金币';
             } else {
-                this.adLabel.string = '播放视频\n' + '获得金币' +  TapTapTool.parseToString(this._getGold);
+                this.adLabel.string = '播放视频获得金币';
             }
         }
     },

assets/scripts/utils/Global.js

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

settings/builder.json

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