wuwangdong hace 4 años
padre
commit
ae98c1f3c8

+ 15 - 15
assets/resources/game/coregame/coregame.prefab

@@ -6318,8 +6318,8 @@
         0,
         0,
         1,
-        0.7,
-        0.7,
+        0.6,
+        0.6,
         1
       ]
     },
@@ -6729,7 +6729,7 @@
       "ctor": "Float64Array",
       "array": [
         -30,
-        17,
+        0,
         0,
         0,
         0,
@@ -11137,8 +11137,8 @@
         0,
         0,
         1,
-        0.7,
-        0.7,
+        0.6,
+        0.6,
         1
       ]
     },
@@ -11548,7 +11548,7 @@
       "ctor": "Float64Array",
       "array": [
         -30,
-        17,
+        0,
         0,
         0,
         0,
@@ -15943,8 +15943,8 @@
         0,
         0,
         1,
-        0.7,
-        0.7,
+        0.6,
+        0.6,
         1
       ]
     },
@@ -16354,7 +16354,7 @@
       "ctor": "Float64Array",
       "array": [
         -30,
-        17,
+        0,
         0,
         0,
         0,
@@ -18811,7 +18811,7 @@
       "ctor": "Float64Array",
       "array": [
         -10,
-        -36,
+        -53,
         0,
         0,
         0,
@@ -21172,7 +21172,7 @@
       "ctor": "Float64Array",
       "array": [
         -10,
-        -36,
+        -53,
         0,
         0,
         0,
@@ -23533,7 +23533,7 @@
       "ctor": "Float64Array",
       "array": [
         -10,
-        -36,
+        -53,
         0,
         0,
         0,
@@ -25894,7 +25894,7 @@
       "ctor": "Float64Array",
       "array": [
         -10,
-        -36,
+        -53,
         0,
         0,
         0,
@@ -28255,7 +28255,7 @@
       "ctor": "Float64Array",
       "array": [
         -10,
-        -36,
+        -53,
         0,
         0,
         0,
@@ -30628,7 +30628,7 @@
       "ctor": "Float64Array",
       "array": [
         -10,
-        -36,
+        -53,
         0,
         0,
         0,

+ 32 - 32
assets/resources/game/prefab/game.prefab

@@ -2000,7 +2000,7 @@
       "ctor": "Float64Array",
       "array": [
         -315,
-        -92.398,
+        -73.398,
         0,
         0,
         0,
@@ -2063,8 +2063,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        48.202,
-        355.024,
+        42.202,
+        293.024,
         0,
         0,
         0,
@@ -2284,8 +2284,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        63.339,
-        154.835,
+        57.339,
+        88.83500000000001,
         0,
         0,
         0,
@@ -2443,8 +2443,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 170,
-      "height": 100
+      "width": 180,
+      "height": 120
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2455,8 +2455,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -10.422,
-        -41.688,
+        -16.628,
+        -43.688,
         0,
         0,
         0,
@@ -2599,7 +2599,7 @@
       "ctor": "Float64Array",
       "array": [
         -2.67,
-        -385.449,
+        -466.449,
         0,
         0,
         0,
@@ -2857,8 +2857,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -3081,7 +3081,7 @@
     },
     "_enabled": true,
     "panel_name": "module/sign/sign",
-    "bool_Auth": true,
+    "bool_Auth": false,
     "open_type": 0,
     "transition_type": 0,
     "onComplete": {
@@ -3376,8 +3376,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -4111,15 +4111,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -72.949,
+        -115.94900000000001,
         100,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         1
       ]
     },
@@ -5192,15 +5192,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        242.778,
+        224.778,
         100,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         1
       ]
     },
@@ -5625,8 +5625,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        0.9,
+        0.9,
         1
       ]
     },
@@ -6007,15 +6007,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        198.942,
+        159.942,
         -21.041,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -6356,7 +6356,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "8bwi6jl7ZJGoKJMRx4Xj+M",
+    "fileId": "a0jxxFqeFC1JSyQdyJTITk",
     "sync": false
   },
   {
@@ -6589,7 +6589,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "0fF/eXs4hELZCqlOpjMT4q",
+    "fileId": "052B+ur0dKwIg4L87vzt+r",
     "sync": false
   },
   {
@@ -6719,7 +6719,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "90AvAGr8tJOqA3UG+J3gJP",
+    "fileId": "08sIy2OxxI77gpZU6azFzA",
     "sync": false
   },
   {
@@ -9825,7 +9825,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -585.335,
+        -603.335,
         0,
         0,
         0,
@@ -10895,7 +10895,7 @@
       "__id__": 293
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 325
@@ -11175,7 +11175,7 @@
     "_left": 0,
     "_right": 0,
     "_top": 0,
-    "_bottom": 21.664999999999964,
+    "_bottom": 3.6649999999999636,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
     "_isAbsLeft": true,

+ 155 - 80
assets/resources/game/prefab/uiPanel/ADClearSickPanel.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 40
       },
       {
-        "__id__": 39
+        "__id__": 41
       },
       {
-        "__id__": 41
+        "__id__": 43
       },
       {
-        "__id__": 42
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 45
     },
     "_opacity": 255,
     "_color": {
@@ -88,7 +88,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "背景",
+    "_name": "New Node",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
@@ -96,28 +96,92 @@
     "_children": [
       {
         "__id__": 3
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 39
+    },
+    "_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.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1.2,
+        1.2,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "背景",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [
+      {
+        "__id__": 4
       },
       {
-        "__id__": 7
+        "__id__": 8
       },
       {
-        "__id__": 10
+        "__id__": 11
       },
       {
-        "__id__": 14
+        "__id__": 15
       },
       {
-        "__id__": 20
+        "__id__": 21
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 38
     },
     "_opacity": 255,
     "_color": {
@@ -171,20 +235,20 @@
     "_name": "closeButton",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 4
+        "__id__": 5
       },
       {
-        "__id__": 5
+        "__id__": 6
       }
     ],
     "_prefab": {
-      "__id__": 6
+      "__id__": 7
     },
     "_opacity": 255,
     "_color": {
@@ -238,7 +302,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 3
+      "__id__": 4
     },
     "_enabled": true,
     "_materials": [
@@ -270,7 +334,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 3
+      "__id__": 4
     },
     "_enabled": true,
     "node_panel": {
@@ -288,7 +352,7 @@
     "asset": {
       "__uuid__": "f5c0b09e-7ed9-41a5-aa98-47b18e3423f9"
     },
-    "fileId": "d51AnIYsZPJbidnSPNRmok",
+    "fileId": "35fp4+LwRId7ZaoAGl6d1x",
     "sync": false
   },
   {
@@ -296,17 +360,17 @@
     "_name": "标题",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 8
+        "__id__": 9
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 10
     },
     "_opacity": 255,
     "_color": {
@@ -360,7 +424,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 7
+      "__id__": 8
     },
     "_enabled": true,
     "_materials": [
@@ -396,7 +460,7 @@
     "asset": {
       "__uuid__": "f5c0b09e-7ed9-41a5-aa98-47b18e3423f9"
     },
-    "fileId": "d9nwuu0DhKSpmvY/TO8c7F",
+    "fileId": "6fSBG0Rm5KRbGhha/jS0wG",
     "sync": false
   },
   {
@@ -404,20 +468,20 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 11
+        "__id__": 12
       },
       {
-        "__id__": 12
+        "__id__": 13
       }
     ],
     "_prefab": {
-      "__id__": 13
+      "__id__": 14
     },
     "_opacity": 255,
     "_color": {
@@ -471,7 +535,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 10
+      "__id__": 11
     },
     "_enabled": true,
     "_materials": [
@@ -504,7 +568,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 10
+      "__id__": 11
     },
     "_enabled": true,
     "_color": {
@@ -525,7 +589,7 @@
     "asset": {
       "__uuid__": "f5c0b09e-7ed9-41a5-aa98-47b18e3423f9"
     },
-    "fileId": "ddSQ74FeJEup0WTAWWJRIT",
+    "fileId": "47/0kPDkFDVYqxqcbI/0P0",
     "sync": false
   },
   {
@@ -533,21 +597,21 @@
     "_name": "bg_prize",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [
       {
-        "__id__": 15
+        "__id__": 16
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 18
+        "__id__": 19
       }
     ],
     "_prefab": {
-      "__id__": 19
+      "__id__": 20
     },
     "_opacity": 255,
     "_color": {
@@ -601,17 +665,17 @@
     "_name": "farm",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 14
+      "__id__": 15
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 16
+        "__id__": 17
       }
     ],
     "_prefab": {
-      "__id__": 17
+      "__id__": 18
     },
     "_opacity": 255,
     "_color": {
@@ -665,7 +729,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 16
     },
     "_enabled": true,
     "_materials": [
@@ -700,7 +764,7 @@
     "asset": {
       "__uuid__": "f5c0b09e-7ed9-41a5-aa98-47b18e3423f9"
     },
-    "fileId": "e5SRX7NeVNRoyfK9MpG5OZ",
+    "fileId": "dagdEqEOdBq7W+G6w4iQC6",
     "sync": false
   },
   {
@@ -708,7 +772,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 14
+      "__id__": 15
     },
     "_enabled": true,
     "_materials": [
@@ -743,7 +807,7 @@
     "asset": {
       "__uuid__": "f5c0b09e-7ed9-41a5-aa98-47b18e3423f9"
     },
-    "fileId": "52ko4RmPpFLbkAVKNpjMzg",
+    "fileId": "fbfP1hLmpOjomyYl6e+Haz",
     "sync": false
   },
   {
@@ -751,30 +815,30 @@
     "_name": "立即领取",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [
       {
-        "__id__": 21
+        "__id__": 22
       },
       {
-        "__id__": 24
+        "__id__": 25
       },
       {
-        "__id__": 28
+        "__id__": 29
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 33
       },
       {
-        "__id__": 33
+        "__id__": 34
       }
     ],
     "_prefab": {
-      "__id__": 35
+      "__id__": 36
     },
     "_opacity": 255,
     "_color": {
@@ -828,17 +892,17 @@
     "_name": "video_icon",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 20
+      "__id__": 21
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 23
       }
     ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 24
     },
     "_opacity": 255,
     "_color": {
@@ -892,7 +956,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 21
+      "__id__": 22
     },
     "_enabled": true,
     "_materials": [
@@ -927,7 +991,7 @@
     "asset": {
       "__uuid__": "f5c0b09e-7ed9-41a5-aa98-47b18e3423f9"
     },
-    "fileId": "d4HZGJhpFN6bd8Q7Nizc6Y",
+    "fileId": "edKQEN3ApA3q537a/5Wsie",
     "sync": false
   },
   {
@@ -935,20 +999,20 @@
     "_name": "按钮文本",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 20
+      "__id__": 21
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 26
       },
       {
-        "__id__": 26
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 27
+      "__id__": 28
     },
     "_opacity": 255,
     "_color": {
@@ -1002,7 +1066,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 25
     },
     "_enabled": true,
     "_materials": [
@@ -1035,7 +1099,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 25
     },
     "_enabled": true,
     "_color": {
@@ -1056,7 +1120,7 @@
     "asset": {
       "__uuid__": "f5c0b09e-7ed9-41a5-aa98-47b18e3423f9"
     },
-    "fileId": "54zWyrFTRAmJ/n9XmM6LRb",
+    "fileId": "1aAhada0NL+bsamVPAaCj4",
     "sync": false
   },
   {
@@ -1064,20 +1128,20 @@
     "_name": "hb",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 20
+      "__id__": 21
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 29
+        "__id__": 30
       },
       {
-        "__id__": 30
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 31
+      "__id__": 32
     },
     "_opacity": 255,
     "_color": {
@@ -1131,7 +1195,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 28
+      "__id__": 29
     },
     "_enabled": true,
     "_materials": [
@@ -1163,7 +1227,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 28
+      "__id__": 29
     },
     "_enabled": true,
     "_defaultClip": {
@@ -1185,7 +1249,7 @@
     "asset": {
       "__uuid__": "f5c0b09e-7ed9-41a5-aa98-47b18e3423f9"
     },
-    "fileId": "0d4Ru/IDdFpqCHph1qAPkT",
+    "fileId": "2f+QchPftM56+8KzGdQeR6",
     "sync": false
   },
   {
@@ -1193,7 +1257,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 20
+      "__id__": 21
     },
     "_enabled": true,
     "_materials": [
@@ -1225,7 +1289,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 20
+      "__id__": 21
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1234,7 +1298,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 34
+        "__id__": 35
       }
     ],
     "_N$interactable": true,
@@ -1310,7 +1374,7 @@
     "asset": {
       "__uuid__": "f5c0b09e-7ed9-41a5-aa98-47b18e3423f9"
     },
-    "fileId": "326K1Yi95AR508UoqaGQ4z",
+    "fileId": "3adodaPeJDt5gLN0gU6a34",
     "sync": false
   },
   {
@@ -1318,7 +1382,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2
+      "__id__": 3
     },
     "_enabled": true,
     "_materials": [
@@ -1353,7 +1417,18 @@
     "asset": {
       "__uuid__": "f5c0b09e-7ed9-41a5-aa98-47b18e3423f9"
     },
-    "fileId": "7atPS97ydBcp1QTAX+e6zf",
+    "fileId": "baA+DhQapKTYgGskxSkox7",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "f5c0b09e-7ed9-41a5-aa98-47b18e3423f9"
+    },
+    "fileId": "c67z5/tJpMYrRPnJOIGrSr",
     "sync": false
   },
   {
@@ -1402,7 +1477,7 @@
     "bClickClose": true,
     "onComplete": [
       {
-        "__id__": 40
+        "__id__": 42
       }
     ],
     "_id": ""
@@ -1426,7 +1501,7 @@
     },
     "_enabled": true,
     "effect_par": {
-      "__id__": 2
+      "__id__": 3
     },
     "open_effect": 1,
     "isOpenCloseEffect": true,
@@ -1445,16 +1520,16 @@
     },
     "_enabled": true,
     "labTitle": {
-      "__id__": 8
+      "__id__": 9
     },
     "labDes": {
-      "__id__": 11
+      "__id__": 12
     },
     "sp": {
-      "__id__": 16
+      "__id__": 17
     },
     "labBtn": {
-      "__id__": 25
+      "__id__": 26
     },
     "_id": ""
   },

+ 151 - 76
assets/resources/game/prefab/uiPanel/ADUnlockPanel.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 40
       },
       {
-        "__id__": 39
+        "__id__": 41
       },
       {
-        "__id__": 41
+        "__id__": 43
       },
       {
-        "__id__": 42
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 45
     },
     "_opacity": 255,
     "_color": {
@@ -88,7 +88,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "背景",
+    "_name": "New Node",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
@@ -96,28 +96,92 @@
     "_children": [
       {
         "__id__": 3
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 39
+    },
+    "_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.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1.2,
+        1.2,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "背景",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [
+      {
+        "__id__": 4
       },
       {
-        "__id__": 7
+        "__id__": 8
       },
       {
-        "__id__": 10
+        "__id__": 11
       },
       {
-        "__id__": 14
+        "__id__": 15
       },
       {
-        "__id__": 20
+        "__id__": 21
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 38
     },
     "_opacity": 255,
     "_color": {
@@ -171,20 +235,20 @@
     "_name": "closeButton",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 4
+        "__id__": 5
       },
       {
-        "__id__": 5
+        "__id__": 6
       }
     ],
     "_prefab": {
-      "__id__": 6
+      "__id__": 7
     },
     "_opacity": 255,
     "_color": {
@@ -238,7 +302,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 3
+      "__id__": 4
     },
     "_enabled": true,
     "_materials": [
@@ -270,7 +334,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 3
+      "__id__": 4
     },
     "_enabled": true,
     "node_panel": {
@@ -288,7 +352,7 @@
     "asset": {
       "__uuid__": "b909c955-7722-48c8-abeb-eb1ddf0190f1"
     },
-    "fileId": "d51AnIYsZPJbidnSPNRmok",
+    "fileId": "a78sg4Xw1OwoLZ+VqJIV52",
     "sync": false
   },
   {
@@ -296,17 +360,17 @@
     "_name": "labDes",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 8
+        "__id__": 9
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 10
     },
     "_opacity": 255,
     "_color": {
@@ -360,7 +424,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 7
+      "__id__": 8
     },
     "_enabled": true,
     "_materials": [
@@ -396,7 +460,7 @@
     "asset": {
       "__uuid__": "b909c955-7722-48c8-abeb-eb1ddf0190f1"
     },
-    "fileId": "d9nwuu0DhKSpmvY/TO8c7F",
+    "fileId": "0dNMYsv2JJpKit+ZvxdRpZ",
     "sync": false
   },
   {
@@ -404,20 +468,20 @@
     "_name": "立即获得文本",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 11
+        "__id__": 12
       },
       {
-        "__id__": 12
+        "__id__": 13
       }
     ],
     "_prefab": {
-      "__id__": 13
+      "__id__": 14
     },
     "_opacity": 255,
     "_color": {
@@ -471,7 +535,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 10
+      "__id__": 11
     },
     "_enabled": true,
     "_materials": [
@@ -504,7 +568,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 10
+      "__id__": 11
     },
     "_enabled": true,
     "_color": {
@@ -525,7 +589,7 @@
     "asset": {
       "__uuid__": "b909c955-7722-48c8-abeb-eb1ddf0190f1"
     },
-    "fileId": "ddSQ74FeJEup0WTAWWJRIT",
+    "fileId": "76qn2cmJtGPLOvt5Y6W/Ty",
     "sync": false
   },
   {
@@ -533,21 +597,21 @@
     "_name": "bg_prize",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [
       {
-        "__id__": 15
+        "__id__": 16
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 18
+        "__id__": 19
       }
     ],
     "_prefab": {
-      "__id__": 19
+      "__id__": 20
     },
     "_opacity": 255,
     "_color": {
@@ -601,17 +665,17 @@
     "_name": "farm",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 14
+      "__id__": 15
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 16
+        "__id__": 17
       }
     ],
     "_prefab": {
-      "__id__": 17
+      "__id__": 18
     },
     "_opacity": 255,
     "_color": {
@@ -665,7 +729,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 16
     },
     "_enabled": true,
     "_materials": [
@@ -700,7 +764,7 @@
     "asset": {
       "__uuid__": "b909c955-7722-48c8-abeb-eb1ddf0190f1"
     },
-    "fileId": "e5SRX7NeVNRoyfK9MpG5OZ",
+    "fileId": "3c0S7MGGZMGYEoK4qplG5A",
     "sync": false
   },
   {
@@ -708,7 +772,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 14
+      "__id__": 15
     },
     "_enabled": true,
     "_materials": [
@@ -743,7 +807,7 @@
     "asset": {
       "__uuid__": "b909c955-7722-48c8-abeb-eb1ddf0190f1"
     },
-    "fileId": "52ko4RmPpFLbkAVKNpjMzg",
+    "fileId": "90uJpy+jhAFLyQSdqQquoo",
     "sync": false
   },
   {
@@ -751,30 +815,30 @@
     "_name": "立即领取",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [
       {
-        "__id__": 21
+        "__id__": 22
       },
       {
-        "__id__": 24
+        "__id__": 25
       },
       {
-        "__id__": 28
+        "__id__": 29
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 33
       },
       {
-        "__id__": 33
+        "__id__": 34
       }
     ],
     "_prefab": {
-      "__id__": 35
+      "__id__": 36
     },
     "_opacity": 255,
     "_color": {
@@ -828,17 +892,17 @@
     "_name": "video_icon",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 20
+      "__id__": 21
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 23
       }
     ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 24
     },
     "_opacity": 255,
     "_color": {
@@ -892,7 +956,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 21
+      "__id__": 22
     },
     "_enabled": true,
     "_materials": [
@@ -927,7 +991,7 @@
     "asset": {
       "__uuid__": "b909c955-7722-48c8-abeb-eb1ddf0190f1"
     },
-    "fileId": "d4HZGJhpFN6bd8Q7Nizc6Y",
+    "fileId": "4fPjKkKM1K5KvqlguV4vOC",
     "sync": false
   },
   {
@@ -935,20 +999,20 @@
     "_name": "add_window_btn_byte_0",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 20
+      "__id__": 21
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 26
       },
       {
-        "__id__": 26
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 27
+      "__id__": 28
     },
     "_opacity": 255,
     "_color": {
@@ -1002,7 +1066,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 25
     },
     "_enabled": true,
     "_materials": [
@@ -1035,7 +1099,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 25
     },
     "_enabled": true,
     "_color": {
@@ -1056,7 +1120,7 @@
     "asset": {
       "__uuid__": "b909c955-7722-48c8-abeb-eb1ddf0190f1"
     },
-    "fileId": "54zWyrFTRAmJ/n9XmM6LRb",
+    "fileId": "dea3FFnjVF17wmJHLlardZ",
     "sync": false
   },
   {
@@ -1064,20 +1128,20 @@
     "_name": "hb",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 20
+      "__id__": 21
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 29
+        "__id__": 30
       },
       {
-        "__id__": 30
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 31
+      "__id__": 32
     },
     "_opacity": 255,
     "_color": {
@@ -1131,7 +1195,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 28
+      "__id__": 29
     },
     "_enabled": true,
     "_materials": [
@@ -1163,7 +1227,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 28
+      "__id__": 29
     },
     "_enabled": true,
     "_defaultClip": {
@@ -1185,7 +1249,7 @@
     "asset": {
       "__uuid__": "b909c955-7722-48c8-abeb-eb1ddf0190f1"
     },
-    "fileId": "5bB8XJtJ1FMK7CN68dQbv2",
+    "fileId": "70tq08c8hFNIH31KlHncnZ",
     "sync": false
   },
   {
@@ -1193,7 +1257,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 20
+      "__id__": 21
     },
     "_enabled": true,
     "_materials": [
@@ -1225,7 +1289,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 20
+      "__id__": 21
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1234,7 +1298,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 34
+        "__id__": 35
       }
     ],
     "_N$interactable": true,
@@ -1310,7 +1374,7 @@
     "asset": {
       "__uuid__": "b909c955-7722-48c8-abeb-eb1ddf0190f1"
     },
-    "fileId": "326K1Yi95AR508UoqaGQ4z",
+    "fileId": "4dixzzc2NHWaIdwhORfGd1",
     "sync": false
   },
   {
@@ -1318,7 +1382,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2
+      "__id__": 3
     },
     "_enabled": true,
     "_materials": [
@@ -1353,7 +1417,18 @@
     "asset": {
       "__uuid__": "b909c955-7722-48c8-abeb-eb1ddf0190f1"
     },
-    "fileId": "7atPS97ydBcp1QTAX+e6zf",
+    "fileId": "c9qMtKqDJOe5yvhKSPKJ7I",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "b909c955-7722-48c8-abeb-eb1ddf0190f1"
+    },
+    "fileId": "5cH7//I2ZPEofMjpWyHJ2O",
     "sync": false
   },
   {
@@ -1402,7 +1477,7 @@
     "bClickClose": true,
     "onComplete": [
       {
-        "__id__": 40
+        "__id__": 42
       }
     ],
     "_id": ""
@@ -1436,7 +1511,7 @@
     },
     "_enabled": true,
     "effect_par": {
-      "__id__": 2
+      "__id__": 3
     },
     "open_effect": 1,
     "isOpenCloseEffect": true,

+ 19 - 15
assets/resources/module/inviteFriends/inviteFriends.prefab

@@ -739,8 +739,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -894,7 +894,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 74,
+      "width": 90,
       "height": 52.4
     },
     "_anchorPoint": {
@@ -948,7 +948,7 @@
     "_dstBlendFactor": 771,
     "_string": "一键领取",
     "_N$string": "一键领取",
-    "_fontSize": 18,
+    "_fontSize": 22,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -1176,8 +1176,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -1331,7 +1331,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 74,
+      "width": 90,
       "height": 52.4
     },
     "_anchorPoint": {
@@ -1385,7 +1385,7 @@
     "_dstBlendFactor": 771,
     "_string": "好友详情",
     "_N$string": "好友详情",
-    "_fontSize": 18,
+    "_fontSize": 22,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -1558,8 +1558,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -1713,7 +1713,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 74,
+      "width": 90,
       "height": 52.4
     },
     "_anchorPoint": {
@@ -1767,7 +1767,7 @@
     "_dstBlendFactor": 771,
     "_string": "规则说明",
     "_N$string": "规则说明",
-    "_fontSize": 18,
+    "_fontSize": 22,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -1938,7 +1938,9 @@
       "__id__": 58
     },
     "playOnLoad": true,
+    "actType": 0,
     "isSetSuitStartPos": true,
+    "isDelaySetOrigin": null,
     "_id": ""
   },
   {
@@ -7622,7 +7624,9 @@
       "__id__": 221
     },
     "playOnLoad": true,
+    "actType": 0,
     "isSetSuitStartPos": false,
+    "isDelaySetOrigin": null,
     "_id": ""
   },
   {
@@ -8389,7 +8393,7 @@
     "asset": {
       "__uuid__": "f46c1667-e4ec-4998-8667-1e92c612ee2a"
     },
-    "fileId": "d3j1aw97NN87M0vDakZMBA",
+    "fileId": "1abFVsGX1PL6xC91ww/K23",
     "sync": false
   },
   {
@@ -8519,7 +8523,7 @@
     "asset": {
       "__uuid__": "f46c1667-e4ec-4998-8667-1e92c612ee2a"
     },
-    "fileId": "4eElul1RZJ8pePUToLRHd6",
+    "fileId": "c9G+7Hlb9OQqLGzznfFbMv",
     "sync": false
   },
   {
@@ -8649,7 +8653,7 @@
     "asset": {
       "__uuid__": "f46c1667-e4ec-4998-8667-1e92c612ee2a"
     },
-    "fileId": "f2XuB6gRBI64eTV8/KJY05",
+    "fileId": "3cj0fi7W5A44k46ZfiAdby",
     "sync": false
   },
   {

+ 1 - 1
assets/resources/module/login/login.prefab

@@ -845,7 +845,7 @@
       "__id__": 20
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 22

+ 31 - 31
assets/resources/module/newCashUI/walletCashOut.prefab

@@ -1059,7 +1059,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "ad/mnZoAhE5KX/Ge2BOpFx",
+    "fileId": "82XR5oKYBHf6wN3quHyxQ6",
     "sync": false
   },
   {
@@ -1268,7 +1268,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "a1gmyojahCHZ2qfOygZtZw",
+    "fileId": "ef7moJO5hPGal2sO2FgPjZ",
     "sync": false
   },
   {
@@ -1950,7 +1950,7 @@
       "ctor": "Float64Array",
       "array": [
         183.664,
-        25.18,
+        35.18,
         0,
         0,
         0,
@@ -2289,8 +2289,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -4650,7 +4650,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        3.5,
+        -6.5,
         95.044,
         0,
         0,
@@ -4737,8 +4737,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         1
       ]
     },
@@ -5377,15 +5377,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -0.5,
+        9.5,
         0,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         1
       ]
     },
@@ -6024,15 +6024,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        172.5,
+        192.5,
         0,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         1
       ]
     },
@@ -6641,7 +6641,7 @@
     "_N$paddingRight": 0,
     "_N$paddingTop": 0,
     "_N$paddingBottom": 0,
-    "_N$spacingX": 20,
+    "_N$spacingX": 30,
     "_N$spacingY": 0,
     "_N$verticalDirection": 1,
     "_N$horizontalDirection": 0,
@@ -6708,7 +6708,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        3.5,
+        -6.5,
         0,
         0,
         0,
@@ -6795,8 +6795,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         1
       ]
     },
@@ -7435,15 +7435,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -0.5,
+        9.5,
         0,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         1
       ]
     },
@@ -8082,15 +8082,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        172.5,
+        192.5,
         0,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         1
       ]
     },
@@ -8699,7 +8699,7 @@
     "_N$paddingRight": 0,
     "_N$paddingTop": 0,
     "_N$paddingBottom": 0,
-    "_N$spacingX": 20,
+    "_N$spacingX": 30,
     "_N$spacingY": 0,
     "_N$verticalDirection": 1,
     "_N$horizontalDirection": 0,
@@ -8853,7 +8853,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -165,
+        -169,
         0,
         0,
         0,
@@ -9145,15 +9145,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        195.18,
+        183.664,
         -5.942,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -9307,7 +9307,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 70,
+      "width": 76,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -9361,7 +9361,7 @@
     "_dstBlendFactor": 771,
     "_string": "加现金",
     "_N$string": "加现金",
-    "_fontSize": 22,
+    "_fontSize": 24,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,

+ 1256 - 139
assets/resources/module/newOpenRedBag/newOpenRedBag.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 61
+        "__id__": 93
       },
       {
-        "__id__": 62
+        "__id__": 94
       },
       {
-        "__id__": 63
+        "__id__": 95
       },
       {
-        "__id__": 64
+        "__id__": 96
       }
     ],
     "_prefab": {
-      "__id__": 65
+      "__id__": 97
     },
     "_opacity": 255,
     "_color": {
@@ -96,30 +96,12 @@
     "_children": [
       {
         "__id__": 3
-      },
-      {
-        "__id__": 9
-      },
-      {
-        "__id__": 13
-      },
-      {
-        "__id__": 16
-      },
-      {
-        "__id__": 19
-      },
-      {
-        "__id__": 28
-      },
-      {
-        "__id__": 37
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 60
+      "__id__": 92
     },
     "_opacity": 255,
     "_color": {
@@ -178,16 +160,37 @@
     "_children": [
       {
         "__id__": 4
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 11
+      },
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 17
+      },
+      {
+        "__id__": 28
+      },
+      {
+        "__id__": 37
+      },
+      {
+        "__id__": 60
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 7
+        "__id__": 90
       }
     ],
     "_prefab": {
-      "__id__": 8
+      "__id__": 91
     },
     "_opacity": 255,
     "_color": {
@@ -199,7 +202,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 551,
+      "width": 610,
       "height": 777
     },
     "_anchorPoint": {
@@ -212,7 +215,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        113.748,
         0,
         0,
         0,
@@ -344,67 +347,24 @@
     "sync": false
   },
   {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 3
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "d6b388b3-3e0c-4ca2-9e6b-abbd2f1eea44"
-    },
-    "_type": 0,
-    "_sizeMode": 1,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
-    },
-    "fileId": "93yloIAk5GUIZ8hvZUrUpE",
-    "sync": false
-  },
-  {
     "__type__": "cc.Node",
     "_name": "关闭按钮",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 10
+        "__id__": 8
       },
       {
-        "__id__": 11
+        "__id__": 9
       }
     ],
     "_prefab": {
-      "__id__": 12
+      "__id__": 10
     },
     "_opacity": 255,
     "_color": {
@@ -428,8 +388,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        287.175,
-        468.668,
+        306.2,
+        418.876,
         0,
         0,
         0,
@@ -458,7 +418,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 9
+      "__id__": 7
     },
     "_enabled": true,
     "_materials": [
@@ -490,7 +450,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 9
+      "__id__": 7
     },
     "_enabled": true,
     "node_panel": {
@@ -508,25 +468,25 @@
     "asset": {
       "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
     },
-    "fileId": "3a/Rx2o95FQbP39kjn9lBn",
+    "fileId": "8aeKkry2JD36k8mZH71TGd",
     "sync": false
   },
   {
     "__type__": "cc.Node",
-    "_name": "title",
+    "_name": "icon",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
-        "__id__": 14
+        "__id__": 12
       }
     ],
     "_prefab": {
-      "__id__": 15
+      "__id__": 13
     },
     "_opacity": 255,
     "_color": {
@@ -538,8 +498,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 205,
-      "height": 53
+      "width": 63,
+      "height": 63
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -550,15 +510,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
+        -125.527,
         231.527,
         0,
         0,
         0,
         0,
         1,
-        1.2,
-        1.2,
+        1,
+        1,
         1
       ]
     },
@@ -580,7 +540,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 13
+      "__id__": 11
     },
     "_enabled": true,
     "_materials": [
@@ -591,7 +551,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "24d408a1-7fb6-4f25-8a92-68b3f2b7b281"
+      "__uuid__": "eb2a6b74-0d0f-4cf4-9e3f-fc187a8d1b00"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -615,25 +575,25 @@
     "asset": {
       "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
     },
-    "fileId": "1e3uCPLdtKubTC804uaF2K",
+    "fileId": "e4AkfNchZDwKh7faiSHmyN",
     "sync": false
   },
   {
     "__type__": "cc.Node",
-    "_name": "icon",
+    "_name": "title",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
-        "__id__": 17
+        "__id__": 15
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 16
     },
     "_opacity": 255,
     "_color": {
@@ -645,8 +605,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 63,
-      "height": 63
+      "width": 205,
+      "height": 53
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -657,16 +617,16 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -125.527,
-        231.527,
+        0,
+        240.527,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
-        1
+        1.2,
+        1.2,
+        1.2
       ]
     },
     "_eulerAngles": {
@@ -687,7 +647,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 16
+      "__id__": 14
     },
     "_enabled": true,
     "_materials": [
@@ -698,7 +658,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "eb2a6b74-0d0f-4cf4-9e3f-fc187a8d1b00"
+      "__uuid__": "24d408a1-7fb6-4f25-8a92-68b3f2b7b281"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -722,35 +682,99 @@
     "asset": {
       "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
     },
-    "fileId": "5aRcCT59lOFbE+GhQn0zZR",
+    "fileId": "cfY0TBHMVKLJoaWM68aphP",
     "sync": false
   },
   {
     "__type__": "cc.Node",
+    "_name": "New Node",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [
+      {
+        "__id__": 18
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 27
+    },
+    "_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.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -167,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1.1,
+        1.1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
     "_name": "openBtn",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 17
     },
     "_children": [
       {
-        "__id__": 20
+        "__id__": 19
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 23
+        "__id__": 22
       },
       {
-        "__id__": 24
+        "__id__": 23
       },
       {
-        "__id__": 26
+        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 27
+      "__id__": 26
     },
     "_opacity": 255,
     "_color": {
@@ -775,7 +799,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -163.115,
+        0,
         0,
         0,
         0,
@@ -804,17 +828,17 @@
     "_name": "video",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 19
+      "__id__": 18
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 21
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 21
     },
     "_opacity": 255,
     "_color": {
@@ -868,7 +892,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 20
+      "__id__": 19
     },
     "_enabled": true,
     "_materials": [
@@ -903,7 +927,7 @@
     "asset": {
       "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
     },
-    "fileId": "83P7eWaRhN5LJYrkHo/Ht+",
+    "fileId": "f8VzNlZ+VJM5BYpd0gvsoT",
     "sync": false
   },
   {
@@ -911,7 +935,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 18
     },
     "_enabled": true,
     "_materials": [
@@ -943,7 +967,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 18
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -952,7 +976,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 25
+        "__id__": 24
       }
     ],
     "_N$interactable": true,
@@ -1008,7 +1032,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 19
+      "__id__": 18
     },
     "_id": ""
   },
@@ -1027,7 +1051,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 18
     },
     "_enabled": true,
     "_defaultClip": {
@@ -1049,7 +1073,18 @@
     "asset": {
       "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
     },
-    "fileId": "44OVascB1F3JoJmvD/DurY",
+    "fileId": "a3Z3MJSmlNT7nUjkA+kqrA",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
+    },
+    "fileId": "19cx6MVudKsZf7MKvCEHzq",
     "sync": false
   },
   {
@@ -1057,7 +1092,7 @@
     "_name": "tip",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [
       {
@@ -1227,7 +1262,7 @@
     "asset": {
       "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
     },
-    "fileId": "90fINxrZJLhpZ3CnvxWiPe",
+    "fileId": "a8iaoaU6lM+pchLtcMW/hH",
     "sync": false
   },
   {
@@ -1335,7 +1370,7 @@
     "asset": {
       "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
     },
-    "fileId": "844HEqo4xP/acRBpIr4GMI",
+    "fileId": "02CA1F4p1DrYMBNAR2K/VU",
     "sync": false
   },
   {
@@ -1378,7 +1413,7 @@
     "asset": {
       "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
     },
-    "fileId": "91qQDFir5OPp1h7QiBTgVP",
+    "fileId": "33PfFVDktA5YWatuP08dS8",
     "sync": false
   },
   {
@@ -1386,7 +1421,7 @@
     "_name": "金额节点",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [
       {
@@ -1436,8 +1471,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -72.437,
-        64.158,
+        -69.437,
+        69.158,
         0,
         0,
         0,
@@ -1587,7 +1622,7 @@
     "asset": {
       "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
     },
-    "fileId": "a0bG6M2idGvYMC3DNKPdXA",
+    "fileId": "bfnfXNpDJAbIDn40bQgXKt",
     "sync": false
   },
   {
@@ -1716,7 +1751,7 @@
     "asset": {
       "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
     },
-    "fileId": "7fn906J/1LiqbwAHuHLvMJ",
+    "fileId": "98dwGEVDZOaL+oDtwuO5g7",
     "sync": false
   },
   {
@@ -1845,7 +1880,7 @@
     "asset": {
       "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
     },
-    "fileId": "f9cX8ViN9LTZ5Anf0n0SIq",
+    "fileId": "f4IH7pmG5LwqBJZmfrJ2Og",
     "sync": false
   },
   {
@@ -1974,7 +2009,7 @@
     "asset": {
       "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
     },
-    "fileId": "18Tur8gc5AtJGgqAvnHEqi",
+    "fileId": "f4VMBF0R1BuL+WpYR1UVuS",
     "sync": false
   },
   {
@@ -2103,7 +2138,7 @@
     "asset": {
       "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
     },
-    "fileId": "08/vnlNGZIxqbAJ13JL5VD",
+    "fileId": "2cpnqT5L5D6KfiC+m3pZu+",
     "sync": false
   },
   {
@@ -2146,7 +2181,1089 @@
     "asset": {
       "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
     },
-    "fileId": "efRQSVdO9OQ5qA+UA6Qqdp",
+    "fileId": "99x0eBH5VLlqtHeXEica8j",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "提现节点",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [
+      {
+        "__id__": 61
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 89
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 600,
+      "height": 110.00000000000023
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -475.313,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "背景",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 60
+    },
+    "_children": [
+      {
+        "__id__": 62
+      },
+      {
+        "__id__": 65
+      },
+      {
+        "__id__": 69
+      },
+      {
+        "__id__": 72
+      },
+      {
+        "__id__": 82
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 87
+      }
+    ],
+    "_prefab": {
+      "__id__": 88
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 568,
+      "height": 127
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "图标",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 61
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 63
+      }
+    ],
+    "_prefab": {
+      "__id__": 64
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 84,
+      "height": 84
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -208.886,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 62
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "d25dcb00-26e2-46bf-a977-9b25070ff00e"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
+    },
+    "fileId": "45uBMzQH5BTqejBQA4j0dT",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "提现金额",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 61
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 66
+      },
+      {
+        "__id__": 67
+      }
+    ],
+    "_prefab": {
+      "__id__": 68
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 251,
+      "g": 240,
+      "b": 110,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 75.7,
+      "height": 54.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -92.075,
+        21.989,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 65
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "0.5元",
+    "_N$string": "0.5元",
+    "_fontSize": 30,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 1,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 65
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 151,
+      "g": 19,
+      "b": 8,
+      "a": 255
+    },
+    "_width": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
+    },
+    "fileId": "42xVGhMFpPy5jYzeNxLc0h",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "提现进度",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 61
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 70
+      }
+    ],
+    "_prefab": {
+      "__id__": 71
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 151,
+      "g": 19,
+      "b": 8,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 104,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        13.743,
+        19.239,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 69
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "提现进度",
+    "_N$string": "提现进度",
+    "_fontSize": 26,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 1,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
+    },
+    "fileId": "5epUa18BRMzaP+SdZmlK2w",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "进度条背景",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 61
+    },
+    "_children": [
+      {
+        "__id__": 73
+      },
+      {
+        "__id__": 76
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 80
+      }
+    ],
+    "_prefab": {
+      "__id__": 81
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 234,
+      "height": 30
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -32.515,
+        -21.677,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "进度条",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 72
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 74
+      }
+    ],
+    "_prefab": {
+      "__id__": 75
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 230,
+      "height": 26
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 73
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "9ae7b17e-12eb-4496-9746-ee4ab69b7680"
+    },
+    "_type": 3,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
+    },
+    "fileId": "b2EwgPgK1A9ZZ/g/7Aa0AW",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "进度",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 72
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 77
+      },
+      {
+        "__id__": 78
+      }
+    ],
+    "_prefab": {
+      "__id__": 79
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 85.42,
+      "height": 52.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        2.367,
+        1.323,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 76
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "888/3888",
+    "_N$string": "888/3888",
+    "_fontSize": 20,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 1,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 76
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 151,
+      "g": 19,
+      "b": 8,
+      "a": 255
+    },
+    "_width": 1,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
+    },
+    "fileId": "64QHoFPaNMf43kTJSwPDeU",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 72
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "518d1473-cc4c-429f-b845-19acb33fa54f"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
+    },
+    "fileId": "d5wAEC5c1K7pTzS/HDNu9U",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "提现按钮",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 61
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 83
+      },
+      {
+        "__id__": 84
+      },
+      {
+        "__id__": 85
+      }
+    ],
+    "_prefab": {
+      "__id__": 86
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 133,
+      "height": 60
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        180.156,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        0
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 82
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "86cc49ef-de56-475e-9bb9-c4193dda3b97"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 82
+    },
+    "_enabled": true,
+    "_defaultClip": {
+      "__uuid__": "1c7cfdae-7b6c-46a5-9085-2fa8aa684ac7"
+    },
+    "_clips": [
+      {
+        "__uuid__": "1c7cfdae-7b6c-46a5-9085-2fa8aa684ac7"
+      }
+    ],
+    "playOnLoad": false,
+    "_id": ""
+  },
+  {
+    "__type__": "b8d2cnq+GZLFK30xbLDqr/m",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 82
+    },
+    "_enabled": true,
+    "panel_name": "module/newCashUI/walletCashOut",
+    "bool_Auth": false,
+    "open_type": 0,
+    "transition_type": 3,
+    "onComplete": [],
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
+    },
+    "fileId": "fdFUZJoO5BRbYsH7owPmxQ",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 61
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "9b9b1be9-aac9-45e7-acc0-a4002425a17c"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
+    },
+    "fileId": "b18VCa2GBNeY8MSdFjc302",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
+    },
+    "fileId": "38En298H9N85JbC2Nr/GSC",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "d6b388b3-3e0c-4ca2-9e6b-abbd2f1eea44"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
+    },
+    "fileId": "93yloIAk5GUIZ8hvZUrUpE",
     "sync": false
   },
   {

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 212 - 137
assets/resources/module/redBagTask/redBagTask.prefab


+ 2 - 2
assets/resources/module/sign/prefab/signItem.prefab

@@ -118,7 +118,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -145,
+        -155,
         0,
         0,
         0,
@@ -260,7 +260,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        145,
+        155,
         0,
         0,
         0,

+ 4 - 2
assets/resources/module/sign/sign.prefab

@@ -218,8 +218,8 @@
         0,
         0,
         1,
-        1.1,
-        1.1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -632,6 +632,8 @@
     "limitLength": 0,
     "direction": 1,
     "isHideAllChild": true,
+    "limitDataLen": -1,
+    "addOffset": 10,
     "_id": ""
   },
   {

+ 621 - 120
assets/resources/module/speedUpUI/speedUp.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 74
+        "__id__": 89
       },
       {
-        "__id__": 75
+        "__id__": 90
       },
       {
-        "__id__": 76
+        "__id__": 91
       },
       {
-        "__id__": 77
+        "__id__": 92
       }
     ],
     "_prefab": {
-      "__id__": 78
+      "__id__": 93
     },
     "_opacity": 255,
     "_color": {
@@ -101,7 +101,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 73
+      "__id__": 88
     },
     "_opacity": 255,
     "_color": {
@@ -180,17 +180,20 @@
         "__id__": 33
       },
       {
-        "__id__": 68
+        "__id__": 67
+      },
+      {
+        "__id__": 70
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 71
+        "__id__": 86
       }
     ],
     "_prefab": {
-      "__id__": 72
+      "__id__": 87
     },
     "_opacity": 255,
     "_color": {
@@ -202,8 +205,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 640,
-      "height": 460
+      "width": 650,
+      "height": 700
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -410,8 +413,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        314.005,
-        200.408,
+        265.834,
+        308.792,
         0,
         0,
         0,
@@ -513,14 +516,14 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 193,
-      "g": 105,
-      "b": 51,
+      "r": 148,
+      "g": 82,
+      "b": 37,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 360,
+      "width": 223.36,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -533,7 +536,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        30.01400000000001,
+        57.01400000000001,
         0,
         0,
         0,
@@ -572,8 +575,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "拥有自然之力的农场守护神",
-    "_N$string": "拥有自然之力的农场守护神",
+    "_string": "等待时间-10分钟",
+    "_N$string": "等待时间-10分钟",
     "_fontSize": 30,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -621,14 +624,14 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 193,
-      "g": 105,
-      "b": 51,
+      "r": 148,
+      "g": 82,
+      "b": 37,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 483.37,
+      "width": 480,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -641,7 +644,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -31.445,
+        -11.445,
         0,
         0,
         0,
@@ -680,8 +683,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "加速动植物,商品的等待时间10分钟",
-    "_N$string": "加速动植物,商品的等待时间10分钟",
+    "_string": "减少农作物、动物、商铺的等待时间",
+    "_N$string": "减少农作物、动物、商铺的等待时间",
     "_fontSize": 30,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -749,14 +752,14 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        143.049,
+        176.049,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -831,7 +834,7 @@
         "__id__": 26
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 29
@@ -875,8 +878,8 @@
         0,
         0,
         1,
-        1.2,
-        1.2,
+        1.4,
+        1.4,
         1
       ]
     },
@@ -942,8 +945,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -1276,7 +1279,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 67
+      "__id__": 66
     },
     "_opacity": 255,
     "_color": {
@@ -1301,7 +1304,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -384.067,
+        -437.067,
         0,
         0,
         0,
@@ -1352,11 +1355,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 65
+        "__id__": 64
       }
     ],
     "_prefab": {
-      "__id__": 66
+      "__id__": 65
     },
     "_opacity": 255,
     "_color": {
@@ -2124,7 +2127,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 64
+      "__id__": 63
     },
     "_opacity": 255,
     "_color": {
@@ -2354,88 +2357,21 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "b8d2cnq+GZLFK30xbLDqr/m",
     "_name": "",
     "_objFlags": 0,
     "node": {
       "__id__": 55
     },
     "_enabled": true,
-    "_normalMaterial": null,
-    "_grayMaterial": null,
-    "duration": 0.1,
-    "zoomScale": 1.2,
-    "clickEvents": [
-      {
-        "__id__": 63
-      }
-    ],
-    "_N$interactable": true,
-    "_N$enableAutoGrayEffect": false,
-    "_N$transition": 0,
-    "transition": 0,
-    "_N$normalColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_N$pressedColor": {
-      "__type__": "cc.Color",
-      "r": 211,
-      "g": 211,
-      "b": 211,
-      "a": 255
-    },
-    "pressedColor": {
-      "__type__": "cc.Color",
-      "r": 211,
-      "g": 211,
-      "b": 211,
-      "a": 255
-    },
-    "_N$hoverColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "hoverColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_N$disabledColor": {
-      "__type__": "cc.Color",
-      "r": 124,
-      "g": 124,
-      "b": 124,
-      "a": 255
-    },
-    "_N$normalSprite": null,
-    "_N$pressedSprite": null,
-    "pressedSprite": null,
-    "_N$hoverSprite": null,
-    "hoverSprite": null,
-    "_N$disabledSprite": null,
-    "_N$target": {
-      "__id__": 55
-    },
+    "panel_name": "module/newCashUI/walletCashOut",
+    "bool_Auth": false,
+    "open_type": 0,
+    "transition_type": 3,
+    "onComplete": [],
     "_id": ""
   },
   {
-    "__type__": "cc.ClickEvent",
-    "target": null,
-    "component": "",
-    "_componentId": "c1e64eZn85IbKdNj06vOQYo",
-    "handler": "clickCashOut",
-    "customEventData": ""
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -2511,11 +2447,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 69
+        "__id__": 68
       }
     ],
     "_prefab": {
-      "__id__": 70
+      "__id__": 69
     },
     "_opacity": 255,
     "_color": {
@@ -2527,7 +2463,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 162.25,
+      "width": 194.7,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -2540,7 +2476,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -202,
+        -215,
         0,
         0,
         0,
@@ -2569,7 +2505,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 68
+      "__id__": 67
     },
     "_enabled": true,
     "_materials": [
@@ -2581,7 +2517,7 @@
     "_dstBlendFactor": 771,
     "_string": "今日剩余次数:20",
     "_N$string": "今日剩余次数:20",
-    "_fontSize": 20,
+    "_fontSize": 24,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -2609,6 +2545,571 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "立即领取",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [
+      {
+        "__id__": 71
+      },
+      {
+        "__id__": 74
+      },
+      {
+        "__id__": 78
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 82
+      },
+      {
+        "__id__": 83
+      }
+    ],
+    "_prefab": {
+      "__id__": 85
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 279,
+      "height": 109
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -137.997,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "video_icon",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 70
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 72
+      }
+    ],
+    "_prefab": {
+      "__id__": 73
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 71,
+      "height": 68
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -133.775,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1.2,
+        1.2,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 71
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "b7c2b0ee-ffff-4822-add8-18fb1b55161c@6c48a"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "c24623b9-b557-420c-bf8c-8927ea736fa1"
+    },
+    "fileId": "c1P3L0oM5Lh5/0+aJmTxmP",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "add_window_btn_byte_0",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 70
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 75
+      },
+      {
+        "__id__": 76
+      }
+    ],
+    "_prefab": {
+      "__id__": 77
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 253,
+      "g": 255,
+      "b": 229,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 150,
+      "height": 56.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -4.522,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 74
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "立即拓建",
+    "_N$string": "立即拓建",
+    "_fontSize": 36,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 1,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 0,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 74
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 182,
+      "g": 100,
+      "b": 19,
+      "a": 255
+    },
+    "_width": 3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "c24623b9-b557-420c-bf8c-8927ea736fa1"
+    },
+    "fileId": "3aDDMDbTFPaYAwGzMXPO5a",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "hb",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 70
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 79
+      },
+      {
+        "__id__": 80
+      }
+    ],
+    "_prefab": {
+      "__id__": 81
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 47,
+      "height": 51
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        124.89699999999999,
+        35.591,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 78
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "d5e97c66-9823-45e8-a28f-98221c51338a"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 78
+    },
+    "_enabled": true,
+    "_defaultClip": {
+      "__uuid__": "d51cece8-b476-4297-9b9e-2e09bdd99a18"
+    },
+    "_clips": [
+      {
+        "__uuid__": "d51cece8-b476-4297-9b9e-2e09bdd99a18"
+      }
+    ],
+    "playOnLoad": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "c24623b9-b557-420c-bf8c-8927ea736fa1"
+    },
+    "fileId": "f6bJt1n2VOYqUQrW7OUmUP",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 70
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "b0441a04-95a8-4264-bc52-3881bbf09462@6c48a"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 70
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
+      {
+        "__id__": 84
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 0,
+    "transition": 0,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": null,
+    "component": "",
+    "_componentId": "0c4f2VNCqNOEaoWvFRThSJc",
+    "handler": "clickWatchVideo",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "c24623b9-b557-420c-bf8c-8927ea736fa1"
+    },
+    "fileId": "3dfzxqZJBN94KW94oHPdvw",
+    "sync": false
+  },
+  {
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
@@ -2624,7 +3125,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "583e8dba-cff4-4047-b497-9a963c4f8f8c"
+      "__uuid__": "a989151b-72b7-473f-be09-0356d18bb79b"
     },
     "_type": 0,
     "_sizeMode": 0,

+ 1 - 1
assets/script/game/game/Farmer.ts

@@ -41,7 +41,7 @@ export class Farmer extends cc.Component {
                 this.forwardMask.node.active = !(this.backMask.node.active = false);
             }
         }
-return;
+
         if(this.refreshTime >=0)
         {
             this.refreshTime -= dt;

+ 3 - 3
assets/script/game/module/redBagTask/RedBagTask.ts

@@ -103,9 +103,9 @@ export default class RedBagTask extends cc.Component{
      private clickCashOut() {
         mk.audio.playEffect("button");
         gData.reward.addReward();
-        mk.ui.closePanel(this.node.name);
-        // let path = 'module/redBagCash/redBagCash';
-        // mk.ui.openPanel(path);
+        //mk.ui.closePanel(this.node.name);
+        let path = 'module/newCashUI/walletCashOut';
+        mk.ui.openPanel(path);
     }
 
     private clickCloseBtn(){

+ 8 - 6
assets/script/game/module/sign/Sign.ts

@@ -27,7 +27,7 @@ export default class Sign extends cc.Component {
     }
 
     start() {
-        mk.ad.showNative(4);
+        //mk.ad.showNative(4);
         // gData.sign.sign_can = gData.gameData.getProp(GameProp.sign_can);
         gData.sign.initListData();
         gData.sign.init_data = true;
@@ -47,21 +47,23 @@ export default class Sign extends cc.Component {
             index -= 1;
         //index = 4;
         this.tableview.contentMoveByIndex(index, 0.01);
-
+        this.scroll_view.vertical = false;
         cc.tween(this.node).delay(0.2).call(()=>{
             let allItem = this.tableview.getItemByIndexAndCount(index, 3);
             allItem && allItem.sort((a, b)=>{
 
                 return a.index - b.index;
             })
-
-            for(let i = 0; i != allItem.length; ++i)
+            let len = allItem.length;
+            for(let i = 0; i != len; ++i)
             {
                 allItem[i].active = true;
                 allItem[i].setPosition(allItem[i].position.x, allItem[i].position.y - 600);
                 cc.tween(allItem[i]).delay(i*0.1).by(0.3, {y: 600}, cc.easeSineOut()).start();
             }
             console.log("---");
+        }).delay(0.7).call(()=>{
+            this.scroll_view.vertical = true;
         }).start();
         
     }
@@ -151,7 +153,7 @@ export default class Sign extends cc.Component {
 
     onClickClose() {
         mk.audio.playEffect("closeButton");
-        mk.ad.destroyNativeAd();
-        mk.ad.checkShowInterByChance();
+        //mk.ad.destroyNativeAd();
+        //mk.ad.checkShowInterByChance();
     }
 }

BIN
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser


+ 41 - 15
build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -9061,7 +9061,7 @@ this.clips = this.animation.getClips();
 this.refreshTime = 2.5;
 this.redMoneyNum = 3;
 };
-e.prototype.update = function() {
+e.prototype.update = function(t) {
 this.walk.curTargetPoint && this.walk.curTargetPoint.x > this.node.position.x ? this.node.setScale(cc.v3(-1, 1, 1)) : this.node.setScale(cc.v3(1, 1, 1));
 if (this.walk.state == r.WalkState.Stop) if (this.walk.curTargetPoint && this.walk.curTargetPoint.y > this.node.position.y) {
 this.animation.play(this.clips[1].name);
@@ -9070,6 +9070,10 @@ this.forwardMask.node.active = !(this.backMask.node.active = !0);
 this.animation.play(this.clips[0].name);
 this.forwardMask.node.active = !(this.backMask.node.active = !1);
 }
+if (this.refreshTime >= 0) this.refreshTime -= t; else {
+this.refreshTime = 2.5;
+mk.fly.PlayCoinAnim(1, 3, this.fly_node, "", null, 2);
+}
 };
 i([ l({
 type: r.TakeAwalk,
@@ -18631,6 +18635,8 @@ e.awardLabel = null;
 e.timeLabel = null;
 e.labUnlock = null;
 e.lbl_progress = null;
+e.node_plant = null;
+e.node_product = null;
 e.data = null;
 return e;
 }
@@ -18660,9 +18666,13 @@ o = "";
 if (this.data.tab == l.ProductType.nzw) {
 e = "game/coregame/texture/plant_icons/plantIcon_";
 o = "game/coregame/texture/plant_icons/nameIcon/plant_name_";
+this.node_plant.active = !0;
+this.node_product.active = !1;
 } else {
 e = "game/coregame/texture/factory_icons/factory_";
 o = "game/coregame/texture/factory_icons/factoryNams/factory_name_icon_";
+this.node_plant.active = !1;
+this.node_product.active = !0;
 }
 n = this.plantIcon;
 return [ 4, mk.loader.load(e + t.picture, cc.SpriteFrame) ];
@@ -18754,6 +18764,12 @@ i([ d({
 type: cc.Label,
 tooltip: "进度文本"
 }) ], e.prototype, "lbl_progress", void 0);
+i([ d({
+type: cc.Node
+}) ], e.prototype, "node_plant", void 0);
+i([ d({
+type: cc.Node
+}) ], e.prototype, "node_product", void 0);
 return i([ u ], e);
 }(cc.Component);
 o.default = h;
@@ -20531,7 +20547,7 @@ e.prototype.clickGetRewardBtn = function() {};
 e.prototype.clickCashOut = function() {
 mk.audio.playEffect("button");
 gData.reward.addReward();
-mk.ui.closePanel(this.node.name);
+mk.ui.openPanel("module/newCashUI/walletCashOut");
 };
 e.prototype.clickCloseBtn = function() {
 mk.audio.playEffect("closeButton");
@@ -23110,7 +23126,6 @@ return e;
 }
 e.prototype.onLoad = function() {};
 e.prototype.start = function() {
-mk.ad.showNative(4);
 gData.sign.initListData();
 gData.sign.init_data = !0;
 this.initScollView();
@@ -23122,19 +23137,22 @@ this.tableview = this.scroll_view.node.getComponent("TableView");
 var o = gData.sign.getItemIndexByCanSign();
 o > 0 && (o -= 1);
 this.tableview.contentMoveByIndex(o, .01);
+this.scroll_view.vertical = !1;
 cc.tween(this.node).delay(.2).call(function() {
 var e = t.tableview.getItemByIndexAndCount(o, 3);
 e && e.sort(function(t, e) {
 return t.index - e.index;
 });
-for (var n = 0; n != e.length; ++n) {
-e[n].active = !0;
-e[n].setPosition(e[n].position.x, e[n].position.y - 600);
-cc.tween(e[n]).delay(.1 * n).by(.3, {
+for (var n = e.length, a = 0; a != n; ++a) {
+e[a].active = !0;
+e[a].setPosition(e[a].position.x, e[a].position.y - 600);
+cc.tween(e[a]).delay(.1 * a).by(.3, {
 y: 600
 }, cc.easeSineOut()).start();
 }
 console.log("---");
+}).delay(.7).call(function() {
+t.scroll_view.vertical = !0;
 }).start();
 };
 e.prototype.update = function() {
@@ -23178,8 +23196,6 @@ gData.sign.init_data = !1;
 };
 e.prototype.onClickClose = function() {
 mk.audio.playEffect("closeButton");
-mk.ad.destroyNativeAd();
-mk.ad.checkShowInterByChance();
 };
 i([ u({
 type: cc.ScrollView,
@@ -24906,11 +24922,16 @@ this.node._touchListener.swallowTouches = !1;
 e.prototype.onTouchEnd = function(t) {
 if (!this.isMoved) if (this.isStart) {
 this.stopPropagation && (t.propagationStopped = !0);
-this.canTouch && this.onInPolygon && this.onInPolygon.emit([]);
-this.canTouch && (this.isMoved || this.canTouch && this.onTouchTap && this.onTouchTap.emit([]));
-this.isScaleAct && cc.tween(this.node).to(.1, {
+if (this.canTouch) {
+this.onInPolygon && this.onInPolygon.emit([]);
+this.onTouchTap && this.onTouchTap.emit([]);
+}
+if (this.isScaleAct) {
+cc.tween(this.node).to(.1, {
 scale: 1
 }).start();
+console.log("------end" + this.name);
+}
 } else this.canTouch && this.onOutPolygon && this.onOutPolygon.emit([]);
 this.isStart = !1;
 this.isMoved = !1;
@@ -24919,24 +24940,29 @@ e.prototype.onTouchMove = function(t) {
 if (t.getTouches().length > 1) this.isMoved = !0; else {
 var e = t.getLocation(), o = this.node.convertToNodeSpaceAR(e);
 this.isMoved = cc.Intersection.pointInPolygon(o, this.points);
-this.isScaleAct && this.isMoved && cc.tween(this.node).to(.1, {
+if (this.isScaleAct && this.isMoved) {
+console.log("------move" + this.name);
+cc.tween(this.node).to(.1, {
 scale: 1
 }).start();
 }
+}
 };
 e.prototype.onTouchCancel = function() {
 this.isMoved = !1;
 this.isScaleAct && this.node.setScale(1);
 };
 e.prototype.onTouchStart = function(t) {
-console.log("------" + this.name);
 if (this.canTouch && this.needPolygon && this.points.length >= 3) {
 var e = t.getLocation(), o = this.node.convertToNodeSpaceAR(e);
 this.isStart = cc.Intersection.pointInPolygon(o, this.points);
 }
-this.isScaleAct && this.isStart && cc.tween(this.node).to(.1, {
+if (this.isScaleAct && this.isStart) {
+cc.tween(this.node).to(.1, {
 scale: 1.1
 }).start();
+console.log("------start" + this.name);
+}
 };
 e.prototype.pointInPoly = function(t, e) {
 for (var o = !1, n = -1, a = e.length, i = a - 1; ++n < a; i = n) (e[n].y <= t.y && t.y < e[i].y || e[i].y <= t.y && t.y < e[n].y) && t.x < (e[i].x - e[n].x) * (t.y - e[n].y) / (e[i].y - e[n].y) + e[n].x && (o = !o);

+ 2 - 2
packages-hot-update/cfg.json

@@ -8,7 +8,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/"
     ],
-    "buildTime": 1630394316726,
-    "genTime": 1630394316726,
+    "buildTime": 1630413523727,
+    "genTime": 1630413523727,
     "genVersion": null
 }

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio