Browse Source

1.添加偷菜列表

slambb 3 years ago
parent
commit
f872edec74

+ 95 - 544
assets/Prefabs/UI/listInfo/userListInfoItem.prefab

@@ -24,21 +24,18 @@
         "__id__": 5
       },
       {
-        "__id__": 15
-      },
-      {
-        "__id__": 25
+        "__id__": 14
       }
     ],
     "_active": true,
     "_level": 1,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 22
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 23
     },
     "_opacity": 255,
     "_color": {
@@ -50,8 +47,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 440,
-      "height": 100
+      "width": 511,
+      "height": 143
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -60,7 +57,7 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -220,
+      "x": -255,
       "y": -20,
       "z": 0
     },
@@ -110,8 +107,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 440,
-      "height": 100
+      "width": 511,
+      "height": 143
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -158,9 +155,9 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
+      "__uuid__": "f11ac3b4-ea33-40b5-9894-f9e2c655ecc0"
     },
-    "_type": 0,
+    "_type": 1,
     "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
@@ -197,14 +194,14 @@
         "__id__": 6
       },
       {
-        "__id__": 10
+        "__id__": 9
       }
     ],
     "_active": true,
     "_level": 1,
     "_components": [],
     "_prefab": {
-      "__id__": 14
+      "__id__": 13
     },
     "_opacity": 255,
     "_color": {
@@ -227,14 +224,14 @@
     "_position": {
       "__type__": "cc.Vec3",
       "x": 20,
-      "y": -10,
+      "y": -25,
       "z": 0
     },
     "_scale": {
       "__type__": "cc.Vec3",
-      "x": 0.691,
-      "y": 0.691,
-      "z": 0.691
+      "x": 1,
+      "y": 1,
+      "z": 1
     },
     "_eulerAngles": {
       "__type__": "cc.Vec3",
@@ -250,54 +247,51 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "label",
+    "_name": "stealHead",
     "_objFlags": 0,
     "_parent": {
       "__id__": 5
     },
     "_children": [],
     "_active": true,
-    "_level": 6,
+    "_level": 2,
     "_components": [
       {
         "__id__": 7
-      },
-      {
-        "__id__": 8
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 8
     },
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 42,
-      "g": 155,
-      "b": 200,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 101.2,
-      "height": 26.4
+      "width": 110,
+      "height": 92
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 1
+      "x": 0.5,
+      "y": 0.5
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
+      "x": 52.629,
+      "y": -50,
       "z": 0
     },
     "_scale": {
       "__type__": "cc.Vec3",
-      "x": 1.44718,
-      "y": 1.44718,
-      "z": 1.44718
+      "x": 1,
+      "y": 1,
+      "z": 1
     },
     "_eulerAngles": {
       "__type__": "cc.Vec3",
@@ -312,7 +306,7 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "node": {
@@ -324,39 +318,23 @@
         "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
       }
     ],
-    "_useOriginalSize": false,
-    "_string": "钱包地址:",
-    "_N$string": "钱包地址:",
-    "_fontSize": 20,
-    "_lineHeight": 20,
-    "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_batchAsBitmap": false,
-    "_N$horizontalAlign": 1,
-    "_N$verticalAlign": 1,
-    "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
-    "_N$cacheMode": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.LabelOutline",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 6
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "79ac7807-4019-4cc9-82ab-b32e039ef11f"
     },
-    "_enabled": true,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 42,
-      "g": 155,
-      "b": 200,
-      "a": 255
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
     },
-    "_width": 0.6,
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
     "_id": ""
   },
   {
@@ -367,7 +345,7 @@
     "asset": {
       "__uuid__": "62f924aa-77e6-467a-a2d7-f6630c33e5d8"
     },
-    "fileId": "779kpcfEBMcbb26X0hjj4/",
+    "fileId": "c1l3n6bRlCMK+RtAHWCPHh",
     "sync": false
   },
   {
@@ -382,27 +360,27 @@
     "_level": 2,
     "_components": [
       {
-        "__id__": 11
+        "__id__": 10
       },
       {
-        "__id__": 12
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 13
+      "__id__": 12
     },
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 137,
-      "b": 165,
+      "r": 140,
+      "g": 90,
+      "b": 28,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 271.21,
-      "height": 26.2
+      "width": 200,
+      "height": 31.240000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -411,15 +389,15 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": 132.067,
-      "y": 0,
+      "x": 109.084,
+      "y": -18.174,
       "z": 0
     },
     "_scale": {
       "__type__": "cc.Vec3",
-      "x": 1.44718,
-      "y": 1.44718,
-      "z": 1.44718
+      "x": 1,
+      "y": 1,
+      "z": 1
     },
     "_eulerAngles": {
       "__type__": "cc.Vec3",
@@ -438,7 +416,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 10
+      "__id__": 9
     },
     "_enabled": true,
     "_materials": [
@@ -447,10 +425,10 @@
       }
     ],
     "_useOriginalSize": false,
-    "_string": "asdsdsdasdasd455as4dasd45",
-    "_N$string": "asdsdsdasdasd455as4dasd45",
-    "_fontSize": 20,
-    "_lineHeight": 20,
+    "_string": "",
+    "_N$string": "",
+    "_fontSize": 24,
+    "_lineHeight": 24,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
@@ -459,7 +437,7 @@
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
+    "_N$overflow": 3,
     "_N$cacheMode": 0,
     "_id": ""
   },
@@ -468,14 +446,14 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 10
+      "__id__": 9
     },
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 137,
-      "b": 165,
+      "r": 140,
+      "g": 90,
+      "b": 28,
       "a": 255
     },
     "_width": 0.5,
@@ -503,324 +481,6 @@
     "fileId": "0cxQrxuWJO15OBCVoIH8XG",
     "sync": false
   },
-  {
-    "__type__": "cc.Node",
-    "_name": "remainder",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [
-      {
-        "__id__": 16
-      },
-      {
-        "__id__": 20
-      }
-    ],
-    "_active": true,
-    "_level": 1,
-    "_components": [],
-    "_prefab": {
-      "__id__": 24
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 0,
-      "height": 0
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 1
-    },
-    "_position": {
-      "__type__": "cc.Vec3",
-      "x": 20,
-      "y": -60,
-      "z": 0
-    },
-    "_scale": {
-      "__type__": "cc.Vec3",
-      "x": 0.691,
-      "y": 0.691,
-      "z": 0.691
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "groupIndex": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "label",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 15
-    },
-    "_children": [],
-    "_active": true,
-    "_level": 6,
-    "_components": [
-      {
-        "__id__": 17
-      },
-      {
-        "__id__": 18
-      }
-    ],
-    "_prefab": {
-      "__id__": 19
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 42,
-      "g": 155,
-      "b": 200,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 81.2,
-      "height": 26.4
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 1
-    },
-    "_position": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_scale": {
-      "__type__": "cc.Vec3",
-      "x": 1.44718,
-      "y": 1.44718,
-      "z": 1.44718
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "groupIndex": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 16
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_useOriginalSize": false,
-    "_string": "剩余量:",
-    "_N$string": "剩余量:",
-    "_fontSize": 20,
-    "_lineHeight": 20,
-    "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_batchAsBitmap": false,
-    "_N$horizontalAlign": 1,
-    "_N$verticalAlign": 1,
-    "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
-    "_N$cacheMode": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.LabelOutline",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 16
-    },
-    "_enabled": true,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 42,
-      "g": 155,
-      "b": 200,
-      "a": 255
-    },
-    "_width": 0.6,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "62f924aa-77e6-467a-a2d7-f6630c33e5d8"
-    },
-    "fileId": "97ZjbMdNlL55/UOqRXbCy2",
-    "sync": false
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "value",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 15
-    },
-    "_children": [],
-    "_active": true,
-    "_level": 2,
-    "_components": [
-      {
-        "__id__": 21
-      },
-      {
-        "__id__": 22
-      }
-    ],
-    "_prefab": {
-      "__id__": 23
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 137,
-      "b": 165,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 56.82,
-      "height": 26.4
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 1
-    },
-    "_position": {
-      "__type__": "cc.Vec3",
-      "x": 101.838,
-      "y": 0,
-      "z": 0
-    },
-    "_scale": {
-      "__type__": "cc.Vec3",
-      "x": 1.44718,
-      "y": 1.44718,
-      "z": 1.44718
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "groupIndex": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 20
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_useOriginalSize": false,
-    "_string": "10000",
-    "_N$string": "10000",
-    "_fontSize": 20,
-    "_lineHeight": 20,
-    "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_batchAsBitmap": false,
-    "_N$horizontalAlign": 1,
-    "_N$verticalAlign": 1,
-    "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
-    "_N$cacheMode": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.LabelOutline",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 20
-    },
-    "_enabled": true,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 137,
-      "b": 165,
-      "a": 255
-    },
-    "_width": 0.6,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "62f924aa-77e6-467a-a2d7-f6630c33e5d8"
-    },
-    "fileId": "64osF0E7RHso2bnbpy3JBu",
-    "sync": false
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "62f924aa-77e6-467a-a2d7-f6630c33e5d8"
-    },
-    "fileId": "8e8KrD96dGRYECKW8rHYZm",
-    "sync": false
-  },
   {
     "__type__": "cc.Node",
     "_name": "enter",
@@ -830,18 +490,18 @@
     },
     "_children": [
       {
-        "__id__": 26
+        "__id__": 15
       }
     ],
     "_active": true,
     "_level": 2,
     "_components": [
       {
-        "__id__": 33
+        "__id__": 19
       }
     ],
     "_prefab": {
-      "__id__": 35
+      "__id__": 21
     },
     "_opacity": 255,
     "_color": {
@@ -853,8 +513,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 40
+      "width": 149,
+      "height": 67
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -863,8 +523,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": 365.944,
-      "y": -68.146,
+      "x": 415.944,
+      "y": -65,
       "z": 0
     },
     "_scale": {
@@ -890,25 +550,21 @@
     "_name": "Background",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 25
+      "__id__": 14
     },
-    "_children": [
-      {
-        "__id__": 27
-      }
-    ],
+    "_children": [],
     "_active": true,
     "_level": 2,
     "_components": [
       {
-        "__id__": 30
+        "__id__": 16
       },
       {
-        "__id__": 31
+        "__id__": 17
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 18
     },
     "_opacity": 255,
     "_color": {
@@ -920,68 +576,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 40
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_position": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_scale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "groupIndex": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "Label",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 26
-    },
-    "_children": [],
-    "_active": true,
-    "_level": 3,
-    "_components": [
-      {
-        "__id__": 28
-      }
-    ],
-    "_prefab": {
-      "__id__": 29
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 100,
-      "height": 40
+      "width": 149,
+      "height": 67
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1012,53 +608,12 @@
     "groupIndex": 0,
     "_id": ""
   },
-  {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 27
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_useOriginalSize": false,
-    "_string": "进入农场",
-    "_N$string": "进入农场",
-    "_fontSize": 20,
-    "_lineHeight": 40,
-    "_enableWrapText": false,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_batchAsBitmap": false,
-    "_N$horizontalAlign": 1,
-    "_N$verticalAlign": 1,
-    "_N$fontFamily": "Arial",
-    "_N$overflow": 1,
-    "_N$cacheMode": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "62f924aa-77e6-467a-a2d7-f6630c33e5d8"
-    },
-    "fileId": "98gJVMMXtN/oB5PX8kGpG1",
-    "sync": false
-  },
   {
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 26
+      "__id__": 15
     },
     "_enabled": true,
     "_materials": [
@@ -1069,7 +624,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
+      "__uuid__": "06a5bada-5288-4317-aa11-0f1cc367cc89"
     },
     "_type": 1,
     "_sizeMode": 0,
@@ -1090,7 +645,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 26
+      "__id__": 15
     },
     "_enabled": true,
     "alignMode": 0,
@@ -1128,20 +683,20 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 25
+      "__id__": 14
     },
     "_enabled": true,
     "duration": 0.1,
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 34
+        "__id__": 20
       }
     ],
     "_N$interactable": true,
     "_N$enableAutoGrayEffect": false,
-    "_N$transition": 2,
-    "transition": 2,
+    "_N$transition": 3,
+    "transition": 3,
     "_N$normalColor": {
       "__type__": "cc.Color",
       "r": 230,
@@ -1185,7 +740,7 @@
       "a": 200
     },
     "_N$normalSprite": {
-      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
+      "__uuid__": "06a5bada-5288-4317-aa11-0f1cc367cc89"
     },
     "_N$pressedSprite": {
       "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
@@ -1203,7 +758,7 @@
       "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
     },
     "_N$target": {
-      "__id__": 26
+      "__id__": 15
     },
     "_id": ""
   },
@@ -1237,12 +792,8 @@
     },
     "_enabled": true,
     "listItemAddress": {
-      "__id__": 11
-    },
-    "amount": {
-      "__id__": 21
+      "__id__": 10
     },
-    "otherUserId": "",
     "_id": ""
   },
   {

File diff suppressed because it is too large
+ 231 - 475
assets/Scene/MyCityScene - 004.fire


+ 2 - 2
assets/Script/Network/netUtils.ts

@@ -169,7 +169,7 @@ var utils = {
                         callback(false, _response);
                     notifyCenter.emit("netError", _response);
 
-                    if (window['GlobalD'].GameData.getToast()) {
+                    if (window['GlobalD'].GameData && window['GlobalD'].GameData.getToast()) {
                         GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "网络请求失败!", 1);
                     } else {
                         cc.loader.loadRes("prefab/gameToast", (err, texture) => {
@@ -259,7 +259,7 @@ var utils = {
                         callback(false, _response);
                     notifyCenter.emit("netError", _response);
 
-                    if (window['GlobalD'].GameData.getToast()) {
+                    if (window['GlobalD'].GameData && window['GlobalD'].GameData.getToast()) {
                         GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "网络请求失败!", 1);
                     } else {
                         cc.loader.loadRes("prefab/gameToast", (err, texture) => {

+ 1 - 1
assets/Script/UI/BuildingView.js

@@ -221,7 +221,7 @@ cc.Class({
                 _fruit.parent = this.Fruit;
                 _fruit.zIndex = 999;
                 let _fruitScript = _fruit.getComponent("Content_Button");
-                _fruitScript.NumLabel.string = this.myFruitList[i].amount;
+                _fruitScript.NumLabel.string = this.myFruitList[i].amount + this.myFruitList[i].amountPart;
                 _fruitScript.NameLabel.string = this.myFruitList[i].name;
                 _fruitScript.Name = this.myFruitList[i].name;
                 _fruitScript.SNB = this.myFruitList[i].priceSnb;

+ 0 - 9
assets/Script/adpp/userListInfoItem.js

@@ -9,15 +9,7 @@ cc.Class({
             type: cc.Label,
             serializable: true,
         },
-
-        amount: {
-            default: null,
-            type: cc.Label,
-            serializable: true,
-        },
-
     
-        
         otherUserItem: {
             default: null,
             serializable: false,
@@ -28,7 +20,6 @@ cc.Class({
         let { item } = context;
         this.otherUserItem = item;
         this.listItemAddress.string = item.address;
-        this.amount.string = 0;
     },
 
     /**

+ 6 - 0
assets/Script/public/ManageUI.js

@@ -84,6 +84,8 @@ cc.Class({
 
     inviteNode: cc.Node,
 
+    listUserInfoNode:cc.Node,
+
     //商店面的介绍模板
     mallContent_Name: cc.Label,
     mallContent_Price: cc.Label,
@@ -592,6 +594,10 @@ cc.Class({
     this.inviteNode.getComponent('inviteInfo').onOpenInviteInfo()
   },
 
+  onListUserInfo_Open() {
+    this.listUserInfoNode.getComponent('userListInfo').onOpen();
+  },
+
   //点击钻石兑换
   onButtonEvent_Exchange() {
     this.onSetTouchStatus(this.DiamondGapView, true)

+ 7 - 0
assets/UI/NListInfo.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "e331a1b6-9f5c-4344-9b19-0cf01b69b2a8",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

BIN
assets/UI/NListInfo/listBg.png


+ 34 - 0
assets/UI/NListInfo/listBg.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "38428fa4-6fca-4812-86f4-fc3704292c8f",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "listBg": {
+      "ver": "1.0.4",
+      "uuid": "a53d753e-2c0a-4472-8cc7-5604008cca81",
+      "rawTextureUuid": "38428fa4-6fca-4812-86f4-fc3704292c8f",
+      "trimType": "custom",
+      "trimThreshold": 0,
+      "rotated": false,
+      "offsetX": -1,
+      "offsetY": 0.5,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 1014,
+      "height": 1156,
+      "rawWidth": 1016,
+      "rawHeight": 1157,
+      "borderTop": 574,
+      "borderBottom": 480,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/UI/NListInfo/listClose.png


+ 34 - 0
assets/UI/NListInfo/listClose.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "c7254cbb-6695-44ec-8ddf-7a0894463ead",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "listClose": {
+      "ver": "1.0.4",
+      "uuid": "82d5e36f-b444-46b1-aa4a-63e88f7fce54",
+      "rawTextureUuid": "c7254cbb-6695-44ec-8ddf-7a0894463ead",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 0.5,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 151,
+      "height": 152,
+      "rawWidth": 156,
+      "rawHeight": 157,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/UI/NListInfo/listPaper.png


+ 34 - 0
assets/UI/NListInfo/listPaper.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "3331c799-fbda-4659-a5b8-16acdb7951f3",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "listPaper": {
+      "ver": "1.0.4",
+      "uuid": "54b4e7c0-796d-4f50-8ca4-5c7ae26a3348",
+      "rawTextureUuid": "3331c799-fbda-4659-a5b8-16acdb7951f3",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0.5,
+      "offsetY": -0.5,
+      "trimX": 1,
+      "trimY": 1,
+      "width": 655,
+      "height": 616,
+      "rawWidth": 656,
+      "rawHeight": 617,
+      "borderTop": 180,
+      "borderBottom": 384,
+      "borderLeft": 245,
+      "borderRight": 348,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/UI/NListInfo/listTitle.png


+ 34 - 0
assets/UI/NListInfo/listTitle.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "09ca806c-5e8d-43af-8509-0217e837590a",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "listTitle": {
+      "ver": "1.0.4",
+      "uuid": "7b8aa6f7-e7bb-4978-ba2e-51959101b4c3",
+      "rawTextureUuid": "09ca806c-5e8d-43af-8509-0217e837590a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0.5,
+      "trimX": 0,
+      "trimY": 1,
+      "width": 586,
+      "height": 196,
+      "rawWidth": 586,
+      "rawHeight": 199,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 7 - 0
assets/UI/NListInfo/stealItem.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "c2630cab-9e3f-4bbb-8a11-b5589c815101",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

BIN
assets/UI/NListInfo/stealItem/itemBg.png


+ 34 - 0
assets/UI/NListInfo/stealItem/itemBg.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "2d0de6af-d0ec-4105-a298-f8d9a5137caf",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "itemBg": {
+      "ver": "1.0.4",
+      "uuid": "f11ac3b4-ea33-40b5-9894-f9e2c655ecc0",
+      "rawTextureUuid": "2d0de6af-d0ec-4105-a298-f8d9a5137caf",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 81,
+      "height": 76,
+      "rawWidth": 81,
+      "rawHeight": 76,
+      "borderTop": 25,
+      "borderBottom": 25,
+      "borderLeft": 30,
+      "borderRight": 30,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/UI/NListInfo/stealItem/stealButton.png


+ 34 - 0
assets/UI/NListInfo/stealItem/stealButton.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "34e8cbce-2229-434a-a6e3-03af4b1d5409",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "stealButton": {
+      "ver": "1.0.4",
+      "uuid": "06a5bada-5288-4317-aa11-0f1cc367cc89",
+      "rawTextureUuid": "34e8cbce-2229-434a-a6e3-03af4b1d5409",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -1,
+      "trimX": 1,
+      "trimY": 4,
+      "width": 232,
+      "height": 104,
+      "rawWidth": 234,
+      "rawHeight": 110,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/UI/NListInfo/stealItem/stealHead.png


+ 34 - 0
assets/UI/NListInfo/stealItem/stealHead.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "5aca0bdb-7bb1-4d3c-abf9-9922e0ba9644",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "stealHead": {
+      "ver": "1.0.4",
+      "uuid": "79ac7807-4019-4cc9-82ab-b32e039ef11f",
+      "rawTextureUuid": "5aca0bdb-7bb1-4d3c-abf9-9922e0ba9644",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 171,
+      "height": 144,
+      "rawWidth": 175,
+      "rawHeight": 148,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/UI/NListInfo/stealItem/stealTitle.png


+ 34 - 0
assets/UI/NListInfo/stealItem/stealTitle.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "c285cea0-43b0-470a-bbb4-ad6f688d9fb9",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "stealTitle": {
+      "ver": "1.0.4",
+      "uuid": "42b654e7-6edb-408e-bae2-9ffcd04c9ca4",
+      "rawTextureUuid": "c285cea0-43b0-470a-bbb4-ad6f688d9fb9",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -2.5,
+      "trimX": 0,
+      "trimY": 5,
+      "width": 354,
+      "height": 96,
+      "rawWidth": 354,
+      "rawHeight": 101,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 2 - 2
settings/project.json

@@ -39,13 +39,13 @@
     "default",
     "GameUI"
   ],
-  "last-module-event-record-time": 1642664497689,
+  "last-module-event-record-time": 1643366926685,
   "simulator-orientation": false,
   "simulator-resolution": {
     "height": 640,
     "width": 960
   },
-  "start-scene": "current",
+  "start-scene": "e0bea6db-64db-4c3b-b02a-531046201733",
   "use-customize-simulator": true,
   "use-project-simulator-setting": false
 }

Some files were not shown because too many files changed in this diff