1

assets/resources/game/prefab/game.prefab

@@ -6994,7 +6994,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "a4LGvPwYFK9ZLc5FVgrU20",
+    "fileId": "38hzijHtJJ/Y0kt7xDnnfj",
     "sync": false
   },
   {
@@ -7227,7 +7227,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "dd1kkjkbZHGrVh7/dXTEUI",
+    "fileId": "4aKSEdKBhC/4+LdviV+iKj",
     "sync": false
   },
   {
@@ -7357,7 +7357,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "6bwct8R1lNfbGb93N07/mX",
+    "fileId": "0eGf14fkpLV52ZrqsP7Emz",
     "sync": false
   },
   {
@@ -11536,7 +11536,7 @@
       "__id__": 313
     },
     "_children": [],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 345
@@ -11635,7 +11635,7 @@
       "__id__": 344
     },
     "_enabled": true,
-    "panel_name": "",
+    "panel_name": "module/farmMap/farmMap",
     "bool_Auth": false,
     "open_type": 0,
     "transition_type": 0,
@@ -11825,7 +11825,7 @@
     "node": {
       "__id__": 228
     },
-    "_enabled": false,
+    "_enabled": true,
     "btn1": {
       "__id__": 257
     },

assets/resources/module/inviteFriends/texture/invite_window_bg.png.meta

@@ -27,7 +27,7 @@
       "rawWidth": 750,
       "rawHeight": 1334,
       "borderTop": 0,
-      "borderBottom": 0,
+      "borderBottom": 1269,
       "borderLeft": 0,
       "borderRight": 0,
       "subMetas": {}

assets/resources/module/newOpenRedBag/newOpenRedBag.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 58
+        "__id__": 61
       },
       {
-        "__id__": 59
+        "__id__": 62
       },
       {
-        "__id__": 60
+        "__id__": 63
       },
       {
-        "__id__": 61
+        "__id__": 64
       }
     ],
     "_prefab": {
-      "__id__": 62
+      "__id__": 65
     },
     "_opacity": 255,
     "_color": {
@@ -98,25 +98,28 @@
         "__id__": 3
       },
       {
-        "__id__": 6
+        "__id__": 9
       },
       {
-        "__id__": 10
+        "__id__": 13
       },
       {
         "__id__": 16
       },
       {
-        "__id__": 25
+        "__id__": 19
       },
       {
-        "__id__": 34
+        "__id__": 28
+      },
+      {
+        "__id__": 37
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 57
+      "__id__": 60
     },
     "_opacity": 255,
     "_color": {
@@ -172,15 +175,19 @@
     "_parent": {
       "__id__": 2
     },
-    "_children": [],
+    "_children": [
+      {
+        "__id__": 4
+      }
+    ],
     "_active": true,
     "_components": [
       {
-        "__id__": 4
+        "__id__": 7
       }
     ],
     "_prefab": {
-      "__id__": 5
+      "__id__": 8
     },
     "_opacity": 255,
     "_color": {
@@ -230,6 +237,113 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Node",
+    "_name": "New Sprite(Splash)",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 6
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 610,
+      "height": 190
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -78,
+        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__": 4
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "f9e4033d-a584-430e-8b92-78fde4e2b2b0"
+    },
+    "_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": "d7KsvQrXlDr5CEB1NegIjZ",
+    "sync": false
+  },
+  {
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
@@ -283,14 +397,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 7
+        "__id__": 10
       },
       {
-        "__id__": 8
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 12
     },
     "_opacity": 255,
     "_color": {
@@ -344,7 +458,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 6
+      "__id__": 9
     },
     "_enabled": true,
     "_materials": [
@@ -376,7 +490,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 6
+      "__id__": 9
     },
     "_enabled": true,
     "node_panel": {
@@ -399,16 +513,12 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "icon",
+    "_name": "title",
     "_objFlags": 0,
     "_parent": {
       "__id__": 2
     },
-    "_children": [
-      {
-        "__id__": 11
-      }
-    ],
+    "_children": [],
     "_active": true,
     "_components": [
       {
@@ -428,8 +538,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 63,
-      "height": 63
+      "width": 205,
+      "height": 53
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -440,15 +550,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -125.527,
+        0,
         231.527,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -466,21 +576,64 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 13
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "24d408a1-7fb6-4f25-8a92-68b3f2b7b281"
+    },
+    "_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": "1e3uCPLdtKubTC804uaF2K",
+    "sync": false
+  },
+  {
     "__type__": "cc.Node",
-    "_name": "title",
+    "_name": "icon",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 10
+      "__id__": 2
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
-        "__id__": 12
+        "__id__": 17
       }
     ],
     "_prefab": {
-      "__id__": 13
+      "__id__": 18
     },
     "_opacity": 255,
     "_color": {
@@ -492,8 +645,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 205,
-      "height": 53
+      "width": 63,
+      "height": 63
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -504,8 +657,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        160.395,
-        0,
+        -125.527,
+        231.527,
         0,
         0,
         0,
@@ -534,50 +687,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 11
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "24d408a1-7fb6-4f25-8a92-68b3f2b7b281"
-    },
-    "_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": "bbRwqf30ZDKaIYdC5kbtKj",
-    "sync": false
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 10
+      "__id__": 16
     },
     "_enabled": true,
     "_materials": [
@@ -624,23 +734,23 @@
     },
     "_children": [
       {
-        "__id__": 17
+        "__id__": 20
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 23
       },
       {
-        "__id__": 21
+        "__id__": 24
       },
       {
-        "__id__": 23
+        "__id__": 26
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 27
     },
     "_opacity": 255,
     "_color": {
@@ -694,17 +804,17 @@
     "_name": "video",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 16
+      "__id__": 19
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 18
+        "__id__": 21
       }
     ],
     "_prefab": {
-      "__id__": 19
+      "__id__": 22
     },
     "_opacity": 255,
     "_color": {
@@ -758,7 +868,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 17
+      "__id__": 20
     },
     "_enabled": true,
     "_materials": [
@@ -801,7 +911,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 16
+      "__id__": 19
     },
     "_enabled": true,
     "_materials": [
@@ -833,7 +943,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 16
+      "__id__": 19
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -842,7 +952,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 22
+        "__id__": 25
       }
     ],
     "_N$interactable": true,
@@ -898,7 +1008,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 16
+      "__id__": 19
     },
     "_id": ""
   },
@@ -917,7 +1027,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 16
+      "__id__": 19
     },
     "_enabled": true,
     "_defaultClip": {
@@ -951,20 +1061,20 @@
     },
     "_children": [
       {
-        "__id__": 26
+        "__id__": 29
       },
       {
-        "__id__": 29
+        "__id__": 32
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 35
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 36
     },
     "_opacity": 255,
     "_color": {
@@ -1018,17 +1128,17 @@
     "_name": "wechat",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 25
+      "__id__": 28
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 27
+        "__id__": 30
       }
     ],
     "_prefab": {
-      "__id__": 28
+      "__id__": 31
     },
     "_opacity": 255,
     "_color": {
@@ -1082,7 +1192,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 26
+      "__id__": 29
     },
     "_enabled": true,
     "_materials": [
@@ -1125,17 +1235,17 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 25
+      "__id__": 28
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 30
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 31
+      "__id__": 34
     },
     "_opacity": 255,
     "_color": {
@@ -1189,7 +1299,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 32
     },
     "_enabled": true,
     "_materials": [
@@ -1233,7 +1343,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 25
+      "__id__": 28
     },
     "_enabled": true,
     "_materials": [
@@ -1280,29 +1390,29 @@
     },
     "_children": [
       {
-        "__id__": 35
+        "__id__": 38
       },
       {
-        "__id__": 39
+        "__id__": 42
       },
       {
-        "__id__": 43
+        "__id__": 46
       },
       {
-        "__id__": 47
+        "__id__": 50
       },
       {
-        "__id__": 51
+        "__id__": 54
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 55
+        "__id__": 58
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 59
     },
     "_opacity": 255,
     "_color": {
@@ -1356,20 +1466,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 34
+      "__id__": 37
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 39
       },
       {
-        "__id__": 37
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 41
     },
     "_opacity": 255,
     "_color": {
@@ -1423,7 +1533,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 35
+      "__id__": 38
     },
     "_enabled": true,
     "_materials": [
@@ -1456,7 +1566,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 35
+      "__id__": 38
     },
     "_enabled": false,
     "_color": {
@@ -1485,20 +1595,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 34
+      "__id__": 37
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 43
       },
       {
-        "__id__": 41
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 42
+      "__id__": 45
     },
     "_opacity": 255,
     "_color": {
@@ -1552,7 +1662,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 39
+      "__id__": 42
     },
     "_enabled": true,
     "_materials": [
@@ -1585,7 +1695,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 39
+      "__id__": 42
     },
     "_enabled": false,
     "_color": {
@@ -1614,20 +1724,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 34
+      "__id__": 37
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 44
+        "__id__": 47
       },
       {
-        "__id__": 45
+        "__id__": 48
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 49
     },
     "_opacity": 255,
     "_color": {
@@ -1681,7 +1791,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 43
+      "__id__": 46
     },
     "_enabled": true,
     "_materials": [
@@ -1714,7 +1824,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 43
+      "__id__": 46
     },
     "_enabled": false,
     "_color": {
@@ -1743,20 +1853,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 34
+      "__id__": 37
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 51
       },
       {
-        "__id__": 49
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 50
+      "__id__": 53
     },
     "_opacity": 255,
     "_color": {
@@ -1810,7 +1920,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 47
+      "__id__": 50
     },
     "_enabled": true,
     "_materials": [
@@ -1843,7 +1953,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 47
+      "__id__": 50
     },
     "_enabled": false,
     "_color": {
@@ -1872,20 +1982,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 34
+      "__id__": 37
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 52
+        "__id__": 55
       },
       {
-        "__id__": 53
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 54
+      "__id__": 57
     },
     "_opacity": 255,
     "_color": {
@@ -1939,7 +2049,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 51
+      "__id__": 54
     },
     "_enabled": true,
     "_materials": [
@@ -1972,7 +2082,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 51
+      "__id__": 54
     },
     "_enabled": false,
     "_color": {
@@ -2001,7 +2111,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 34
+      "__id__": 37
     },
     "_enabled": false,
     "_layoutSize": {
@@ -2126,13 +2236,13 @@
     "_enabled": true,
     "lbl_value": [
       {
-        "__id__": 40
+        "__id__": 43
       },
       {
-        "__id__": 48
+        "__id__": 51
       },
       {
-        "__id__": 52
+        "__id__": 55
       }
     ],
     "_id": ""

assets/resources/module/speedUpUI/speedUp.prefab

@@ -2001,8 +2001,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 136,
-      "height": 54
+      "width": 133,
+      "height": 60
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2046,7 +2046,7 @@
       "__id__": 51
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 53
@@ -2183,10 +2183,10 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "c3f3ce70-5592-4b5a-bb79-363c0338d77f"
+      "__uuid__": "86cc49ef-de56-475e-9bb9-c4193dda3b97"
     },
     "_type": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 1,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -2478,8 +2478,11 @@
       "__id__": 2
     },
     "open_effect": 1,
+    "isOpenCloseEffect": true,
     "close_effect": 1,
     "close_toPoint": "",
+    "close_uibg": false,
+    "isDelayOneFrame": false,
     "_id": ""
   },
   {

assets/resources/module/turnable/turnable.prefab

@@ -2283,7 +2283,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "2biCx1qRdH/KBYZ6Gv67dc",
+    "fileId": "f5JBWWRChCq7DfRx3E2OGP",
     "sync": false
   },
   {
@@ -2415,7 +2415,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "3bUnbpaqxJ6KTgIm3b34JM",
+    "fileId": "2dJ85zoHVM06Bje5Jd+V4j",
     "sync": false
   },
   {
@@ -2547,7 +2547,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "daKloFLudEKJg1I8E9/3HB",
+    "fileId": "64mSbHjjZCs45VeHJOrCKN",
     "sync": false
   },
   {
@@ -2763,7 +2763,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "14r+SNoS9J9b0AmweeYbDc",
+    "fileId": "f267hKiUxIkb364yKgiU83",
     "sync": false
   },
   {
@@ -2874,7 +2874,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "f31SFsY4dJcZtJVrxiPzh0",
+    "fileId": "76lrIuVAdPrINpEf7rZK1N",
     "sync": false
   },
   {
@@ -4308,7 +4308,7 @@
         "__uuid__": "1c7cfdae-7b6c-46a5-9085-2fa8aa684ac7"
       }
     ],
-    "playOnLoad": false,
+    "playOnLoad": true,
     "_id": ""
   },
   {
@@ -4740,7 +4740,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "c7wLMDfnBArbyS7I5iOXI0",
+    "fileId": "a5N4+XChBEu6jedllaMPkW",
     "sync": false
   },
   {

assets/resources/module/turnable/turnablerule.prefab

@@ -1953,7 +1953,7 @@
       "__id__": 52
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 54
@@ -2090,7 +2090,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "c3f3ce70-5592-4b5a-bb79-363c0338d77f"
+      "__uuid__": "86cc49ef-de56-475e-9bb9-c4193dda3b97"
     },
     "_type": 0,
     "_sizeMode": 0,
@@ -2324,8 +2324,11 @@
       "__id__": 2
     },
     "open_effect": 1,
+    "isOpenCloseEffect": true,
     "close_effect": 1,
     "close_toPoint": "",
+    "close_uibg": false,
+    "isDelayOneFrame": false,
     "_id": ""
   },
   {

assets/script/game/component/TableView.ts

@@ -123,6 +123,7 @@ export default class TableView extends cc.Component {
         // cc.log(this.testTime(0));// 消耗计时
         this.initItem();
         this.initItemPos(0);
+        if(this.isHideAllChild) this.isHideAllChild = false;
         this.scrollView.node.on('scrolling', this.callback, this);
         // cc.log('tableView结束:' + this.testTime());
     }
@@ -608,6 +609,22 @@ export default class TableView extends cc.Component {
         return itemArray;
     }
 
+    public getFrontPositionItemByCount(count: number)
+    {
+        const itemArray: Array<any> = [];
+        for(let i = 0; i != this.itemArr.length; ++i)
+        {
+            if(i < count)
+            {
+                itemArray.push(this.itemArr[i]);
+            }else
+            {
+                this.itemArr[i].active = true;
+            }
+        }
+        return itemArray;
+    }
+
     /**
      * 得到相关位置的排序index
      * 方法待验证，可能有问题

assets/script/game/component/tween/EffectOpenAndClose.ts

@@ -112,7 +112,7 @@ export default class EffectOpenAndClose extends cc.Component {
                     //let toY = this.effect_par.y + this.effect_par.height;
                     let toY = 0;
                     cc.tween(this.effect_par)
-                        .by(0.3, { y: cc.winSize.height }, cc.easeSineOut())
+                        .by(0.3, { y: cc.winSize.height,}, cc.easeSineOut())
                         .start()
                     break;
             }

assets/script/game/component/tween/UITween.ts

@@ -5,6 +5,11 @@ const { ccclass, property, executeInEditMode, playOnFocus } = cc._decorator;
  * 缓动数据
  * @author 薛鸿潇
  */
+enum ActionType{
+    Act_Absolute,
+    Act_relative,
+}
+
 @ccclass("PropsData")
 export class PropsData {
     @property({ displayName: "坐标" })
@@ -60,8 +65,12 @@ export class UITween extends cc.Component {
     @property({ displayName: "自动播放" }) 
     public playOnLoad: boolean = true;
 
+    @property({displayName: "绝对移动or相对移动", type: cc.Enum(ActionType)})
+    public actType: ActionType = ActionType.Act_Absolute;
     @property({displayName:'是否设置起始位置为屏幕旁边按屏幕加节点尺寸的一半'})
     public isSetSuitStartPos: boolean = false;
+    @property({displayName: '是否延时设置初始属性'})
+    public isDelaySetOrigin
 
     private _edit_play: boolean = false;
     @property({ displayName: "编辑器预览" })
@@ -180,54 +189,100 @@ export class UITween extends cc.Component {
                 let toData = {
                     position: targetData.propsData.position,
                     scale: targetData.propsData.scale,
-                    angle: targetData.propsData.angle,
+                    angle: targetData.propsData.angle,              
                 }
                 if (targetData.isOffset) {
                     toData.position = this.node.getPosition().add(targetData.propsData.position);
                     toData.scale = this.node.scale + targetData.propsData.scale;
                     toData.angle = this.node.angle + targetData.propsData.angle;
                 }
-                this.t = this.t.to(
-                    targetData.duration,
-                    toData,
-                    {
-                        easing: TweenEasing[this.tweenEasing] as any,
-                        onComplete: (target: cc.Node) => {
-                            console.log("----------tweenComplete");
-                            if(targetData.onComplete && targetData.onComplete.length > 0)
-                            {
-                               for(let i = 0; i != targetData.onComplete.length; ++i)
-                               {
-                                    targetData.onComplete[i].emit([target]);
-                               } 
-                            }
-                            //targetData.onComplete && targetData.onComplete.emit([target]);
-                            // this.edit_playing = false;
-                            // this._edit_play = false;
-                        },
-                        onStart: (target: cc.Node) => { 
-                            console.log("----------tweenStart");
-                            //targetData.onStart && targetData.onStart.emit([target]) 
-                            if(targetData.onStart && targetData.onStart.length > 0)
-                            {
-                               for(let i = 0; i != targetData.onStart.length; ++i)
-                               {
-                                    targetData.onStart[i].emit([target]);
-                               } 
+                if(this.actType == ActionType.Act_Absolute)
+                {
+                    this.t = this.t.to(
+                        targetData.duration,
+                        toData, 
+                        {
+                            easing: TweenEasing[this.tweenEasing] as any,
+                            onComplete: (target: cc.Node) => {
+                                console.log("----------tweenComplete");
+                                if(targetData.onComplete && targetData.onComplete.length > 0)
+                                {
+                                   for(let i = 0; i != targetData.onComplete.length; ++i)
+                                   {
+                                        targetData.onComplete[i].emit([target]);
+                                   } 
+                                }
+                                //targetData.onComplete && targetData.onComplete.emit([target]);
+                                // this.edit_playing = false;
+                                // this._edit_play = false;
+                            },
+                            onStart: (target: cc.Node) => { 
+                                console.log("----------tweenStart");
+                                //targetData.onStart && targetData.onStart.emit([target]) 
+                                if(targetData.onStart && targetData.onStart.length > 0)
+                                {
+                                   for(let i = 0; i != targetData.onStart.length; ++i)
+                                   {
+                                        targetData.onStart[i].emit([target]);
+                                   } 
+                                }
+                            },
+                            onUpdate: (target: cc.Node, ratio: number) => { 
+                                //targetData.onUpdate && targetData.onUpdate.emit([target, ratio]) 
+                                if(targetData.onUpdate && targetData.onUpdate.length > 0)
+                                {
+                                   for(let i = 0; i != targetData.onUpdate.length; ++i)
+                                   {
+                                        targetData.onUpdate[i].emit([target]);
+                                   } 
+                                }
                             }
-                        },
-                        onUpdate: (target: cc.Node, ratio: number) => { 
-                            //targetData.onUpdate && targetData.onUpdate.emit([target, ratio]) 
-                            if(targetData.onUpdate && targetData.onUpdate.length > 0)
-                            {
-                               for(let i = 0; i != targetData.onUpdate.length; ++i)
-                               {
-                                    targetData.onUpdate[i].emit([target]);
-                               } 
+                        }
+                    );
+                }else
+                {
+                    this.t = this.t.by(
+                        targetData.duration,
+                        toData, 
+                        {
+                            easing: TweenEasing[this.tweenEasing] as any,
+                            onComplete: (target: cc.Node) => {
+                                console.log("----------tweenComplete");
+                                if(targetData.onComplete && targetData.onComplete.length > 0)
+                                {
+                                   for(let i = 0; i != targetData.onComplete.length; ++i)
+                                   {
+                                        targetData.onComplete[i].emit([target]);
+                                   } 
+                                }
+                                //targetData.onComplete && targetData.onComplete.emit([target]);
+                                // this.edit_playing = false;
+                                // this._edit_play = false;
+                            },
+                            onStart: (target: cc.Node) => { 
+                                console.log("----------tweenStart");
+                                //targetData.onStart && targetData.onStart.emit([target]) 
+                                if(targetData.onStart && targetData.onStart.length > 0)
+                                {
+                                   for(let i = 0; i != targetData.onStart.length; ++i)
+                                   {
+                                        targetData.onStart[i].emit([target]);
+                                   } 
+                                }
+                            },
+                            onUpdate: (target: cc.Node, ratio: number) => { 
+                                //targetData.onUpdate && targetData.onUpdate.emit([target, ratio]) 
+                                if(targetData.onUpdate && targetData.onUpdate.length > 0)
+                                {
+                                   for(let i = 0; i != targetData.onUpdate.length; ++i)
+                                   {
+                                        targetData.onUpdate[i].emit([target]);
+                                   } 
+                                }
                             }
                         }
-                    }
-                );
+                    );
+                }        
             }
         }
         if (this.onOneRepeatComplete) {

assets/script/game/module/blessingBag/BlessingBag.ts

@@ -4,6 +4,7 @@
  */
 
 import JsbSystem from "../../../mk/system/JsbSystem";
+import TableView from "../../component/TableView";
 import { AdFun } from "../../data/AdData";
 import { DataEventId, VideoAdType } from "../../data/GameData";
 import { cashProType } from "../../data/module/CashProData";
@@ -71,6 +72,8 @@ export default class BlessingBag extends cc.Component {
 
     @property(cc.Node)
     node_xiabiao: cc.Node = null;
+    @property(TableView)
+    tableview: TableView = null;
 
     /**红包页面类型 1 大额 2 任务*/
     private rbPanelType: number = 0;
@@ -107,84 +110,97 @@ export default class BlessingBag extends cc.Component {
     }
 
     UpdateInfo() {
-        let data = gData.blessingBag.videoRbData;
-        if (!data) {
-            return
-        }
-
-        this.targetProgress = data.cumulativeAmount;
-
-        //this.txtBigDelta.node.active = data.showTask != 1;
-        //this.txtBigTask.node.active = data.showTask == 1;
-        this.txtTipAd.string = data.showTask == 1 ? "提现中..." : "<b>满<color=#FFE00C>" + data.requestAmount + "元</color>可提现</b>";
-        //this.txtBigDelta.string = "<outline color=#8C1010 width=4><b>每次视频额外奖励<color=#FFE00C>" + data.videoAmountPerTime + "元</color></b></outline>";
-        //this.txtBigTask.string = "<outline color=#8C1010 width=4>金额已达标，完成<color=#4EB7FF>观看视频</color>任务可到账"
-            + "\n观看视频次数：<color=#FFE00C>" + data.taskVideoWatchTime + "/" + data.taskVideoTime + "</color>，连续观看天数：<color=#FFE00C>" + data.taskVideoWatchDay + "/" + data.taskVideoDay + "</color></outline>"
-
-        this.txtRemaindAdNum.string = "<color=#FDFCF5>今日剩余次数：</c><color=#FFE533>" + data.videoTime + "</color>";
-        this.adIcon.active = data.needToWatchTheVideo == 1;
-
-        if (gData.blessingBag.isPlayAniUpdate) {
-            if (this.lastNum < data.cumulativeAmount) {
-                //let world_pos = this.btnCash.parent.convertToWorldSpaceAR(this.btnCash.getPosition());
-                // mk.fly.PlayCoinAnim(1, 10, this.btnAd, '', () => {
-                //     this.aniBigAdBtn.setCurrentTime(0);
-                //     this.aniBigAdBtn.play();
-                // });
-                this.txtAddEft.node.setPosition(cc.v2(0, 380));
-                this.txtAddEft.string = "+" + data.videoAmountPerTime + "元";
-                this.txtAddEft.node.stopAllActions();
-                this.txtAddEft.node.scale = 0;
-                this.txtAddEft.node.opacity = 255;
-                this.txtAddEft.node.active = true;
-
-                let a0 = cc.delayTime(0.8);
-                let a1t = cc.sequence(cc.scaleTo(0.15, 1.2), cc.scaleTo(0.15, 1));
-                let a1a = cc.spawn(cc.moveBy(0.3, cc.v2(0, 30)), a1t);
-                let a2 = cc.delayTime(0.5);
-                let a3 = cc.fadeOut(0.15);
-                let a4 = cc.callFunc(() => {
-                    //this.txtBigNum.string = data.cumulativeAmount + "元";
-                    this.PlayMoneyAni(0.2);
-                    this.txtAddEft.node.active = false;
-                });
-                this.txtAddEft.node.runAction(cc.sequence(a0, a1a, a2, a3, a4));
-
-            } else {
-                this.txtBigNum.string = data.cumulativeAmount.toFixed(2) + "元";
-                this.lastNum = data.cumulativeAmount;
-            }
-        } else {
-            this.txtBigNum.string = data.cumulativeAmount.toFixed(2) + "元";
-            this.lastNum = data.cumulativeAmount;
-        }
-
-
-        if (this.adrbArray.length < 4) {
-            this.adrbArray = [];
-
-            for (let i = 0; i < data.redMonies.length; i++) {
-                let obj = {
-                    data: data.redMonies[i],
-                    isPlayAniUpdate: gData.blessingBag.isPlayAniUpdate,
-                    isPlayInitAni: this.isPlayInitAni
-                }
-                this.adrbArray.push(obj);
-            }
+        // let data = gData.blessingBag.videoRbData;
+        // if (!data) {
+        //     return
+        // }
+
+        // this.targetProgress = data.cumulativeAmount;
+
+        // //this.txtBigDelta.node.active = data.showTask != 1;
+        // //this.txtBigTask.node.active = data.showTask == 1;
+        // this.txtTipAd.string = data.showTask == 1 ? "提现中..." : "<b>满<color=#FFE00C>" + data.requestAmount + "元</color>可提现</b>";
+        // //this.txtBigDelta.string = "<outline color=#8C1010 width=4><b>每次视频额外奖励<color=#FFE00C>" + data.videoAmountPerTime + "元</color></b></outline>";
+        // //this.txtBigTask.string = "<outline color=#8C1010 width=4>金额已达标，完成<color=#4EB7FF>观看视频</color>任务可到账"
+        //     + "\n观看视频次数：<color=#FFE00C>" + data.taskVideoWatchTime + "/" + data.taskVideoTime + "</color>，连续观看天数：<color=#FFE00C>" + data.taskVideoWatchDay + "/" + data.taskVideoDay + "</color></outline>"
+
+        // this.txtRemaindAdNum.string = "<color=#FDFCF5>今日剩余次数：</c><color=#FFE533>" + data.videoTime + "</color>";
+        // this.adIcon.active = data.needToWatchTheVideo == 1;
+
+        // if (gData.blessingBag.isPlayAniUpdate) {
+        //     if (this.lastNum < data.cumulativeAmount) {
+        //         //let world_pos = this.btnCash.parent.convertToWorldSpaceAR(this.btnCash.getPosition());
+        //         // mk.fly.PlayCoinAnim(1, 10, this.btnAd, '', () => {
+        //         //     this.aniBigAdBtn.setCurrentTime(0);
+        //         //     this.aniBigAdBtn.play();
+        //         // });
+        //         this.txtAddEft.node.setPosition(cc.v2(0, 380));
+        //         this.txtAddEft.string = "+" + data.videoAmountPerTime + "元";
+        //         this.txtAddEft.node.stopAllActions();
+        //         this.txtAddEft.node.scale = 0;
+        //         this.txtAddEft.node.opacity = 255;
+        //         this.txtAddEft.node.active = true;
+
+        //         let a0 = cc.delayTime(0.8);
+        //         let a1t = cc.sequence(cc.scaleTo(0.15, 1.2), cc.scaleTo(0.15, 1));
+        //         let a1a = cc.spawn(cc.moveBy(0.3, cc.v2(0, 30)), a1t);
+        //         let a2 = cc.delayTime(0.5);
+        //         let a3 = cc.fadeOut(0.15);
+        //         let a4 = cc.callFunc(() => {
+        //             //this.txtBigNum.string = data.cumulativeAmount + "元";
+        //             this.PlayMoneyAni(0.2);
+        //             this.txtAddEft.node.active = false;
+        //         });
+        //         this.txtAddEft.node.runAction(cc.sequence(a0, a1a, a2, a3, a4));
+
+        //     } else {
+        //         this.txtBigNum.string = data.cumulativeAmount.toFixed(2) + "元";
+        //         this.lastNum = data.cumulativeAmount;
+        //     }
+        // } else {
+        //     this.txtBigNum.string = data.cumulativeAmount.toFixed(2) + "元";
+        //     this.lastNum = data.cumulativeAmount;
+        // }
+
+
+        // if (this.adrbArray.length < 4) {
+        //     this.adrbArray = [];
+
+        //     for (let i = 0; i < data.redMonies.length; i++) {
+        //         let obj = {
+        //             data: data.redMonies[i],
+        //             isPlayAniUpdate: gData.blessingBag.isPlayAniUpdate,
+        //             isPlayInitAni: this.isPlayInitAni
+        //         }
+        //         this.adrbArray.push(obj);
+        //     }
+        //     this.itemContent.emit('srollview-init', this.adrbArray);
+        // } else
+         {
+            this.adrbArray = [{data:1}, {data:1}, {data:1}, {data:1}, {data:1}, {data:1}, {data:1}, {data:1}, {data:1}, {data:1}];
+
+            // for (let i = 0; i < data.redMonies.length; i++) {
+            //     let obj = {
+            //         data: data.redMonies[i],
+            //         isPlayAniUpdate: gData.blessingBag.isPlayAniUpdate,
+            //         isPlayInitAni: this.isPlayInitAni
+            //     }
+            //     this.adrbArray.push(obj);
+            // }
+            //刷新
             this.itemContent.emit('srollview-init', this.adrbArray);
-        } else {
-            this.adrbArray = [];
 
-            for (let i = 0; i < data.redMonies.length; i++) {
-                let obj = {
-                    data: data.redMonies[i],
-                    isPlayAniUpdate: gData.blessingBag.isPlayAniUpdate,
-                    isPlayInitAni: this.isPlayInitAni
+             
+            cc.tween(this.node).delay(0.2).call(()=>{
+                let allItem = this.tableview.getFrontPositionItemByCount(5);
+                
+                for(let i = 0; i != allItem.length; ++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();
                 }
-                this.adrbArray.push(obj);
-            }
-            //刷新
-            this.itemContent.emit('srollview-update', this.adrbArray);
+            }).start();
         }
 
         this.isPlayInitAni = false;

assets/script/game/module/blessingBag/BlessingBagItem.ts

@@ -40,7 +40,7 @@ export default class BlessingBagItem extends cc.Component{
      * @param data item数据
      */
     public async setItemData(bData) {
-        this.Init(bData.data, bData.isPlayAniUpdate, bData.isPlayInitAni);
+        //this.Init(bData.data, bData.isPlayAniUpdate, bData.isPlayInitAni);
     }
 
     Init(data: any, isPlayAni: boolean = false, isPlayInitAni: boolean = false) {
@@ -74,7 +74,7 @@ export default class BlessingBagItem extends cc.Component{
     }
 
     update(dt) {
-        this.UpdateAniFrame(dt);
+        //this.UpdateAniFrame(dt);
     }
 
     PlayNumAni(time: number) {

assets/script/game/module/farmMap/FarmMap.ts

@@ -1,3 +1,4 @@
+import TableView from "../../component/TableView";
 import ItemName from "./ItemName";
 
 const { ccclass, property } = cc._decorator;
@@ -10,6 +11,9 @@ export default class FarmMap extends cc.Component{
     @property({displayName: '滚动视图', type: cc.ScrollView})
     private scroll_view: cc.ScrollView = null;
 
+    @property(TableView)
+    private tableview: TableView = null;
+
     private curChooseId:number = 1;
 
     onLoad(){
@@ -21,6 +25,17 @@ export default class FarmMap extends cc.Component{
 
         let list_data = [{}, {}, {}, {}, {}, {}, {}];
         this.scroll_view.node.emit('srollview-init', list_data)
+
+        cc.tween(this.node).delay(0.2).call(()=>{
+            let allItem = this.tableview.getFrontPositionItemByCount(5);
+            
+            for(let i = 0; i != allItem.length; ++i)
+            {
+                allItem[i].active = true;
+                allItem[i].setPosition(allItem[i].position.x + 600, allItem[i].position.y);
+                cc.tween(allItem[i]).delay(i*0.1 + 0.2).by(0.3, {x: -600}, cc.easeSineOut()).start();
+            }
+        }).start();
         
         //this.itemName[1].toggle.interactable = false;
 

assets/script/game/module/inviteFriends/InviteFriends.ts

@@ -1,3 +1,4 @@
+import Util from "../../../before/util/Util";
 import InviteItem from "./InviteItem";
 
 
@@ -33,13 +34,17 @@ export default class InviteFriends extends cc.Component{
     start(){
 
         let data = [{}, {}, {},{}, {}, {}, {}];
+        let timeArray = [0.4, 0.6, 0.7, 0.9, 1, 1.2, 1.4];
         let length = this.node_inviteItem.length;
         for(let i = 0; i != length; ++i)
         {
             if(i < data.length)
             {
-                let item = this.node_inviteItem[i].getComponent(InviteItem);
-                item.setItemData(data[i], this.node_end);
+                let rand = Util.rnd(0, timeArray.length-1);
+                let time = timeArray[rand];
+                timeArray.splice(rand, 1);
+                let item = this.node_inviteItem[i].getComponent(InviteItem);               
+                item.setItemData(data[i], this.node_end, time);
             }else{
                 this.node_inviteItem[i].active = false;
             }

assets/script/game/module/inviteFriends/InviteItem.ts

@@ -21,14 +21,21 @@ export default class InviteItem extends cc.Component{
 
     private moveUpAndDownComp: MoveUpAndDown = null;
 
+    private showTime: number = 0;
+
     start(){
 
         this.moveUpAndDownComp = this.node_redBag.getComponent(MoveUpAndDown);
     }
 
-    public setItemData(data, endNode: cc.Node)
+    public setItemData(data, endNode: cc.Node, time: number)
     {
         this.targetNode = endNode;
+        this.showTime = time;
+        cc.tween(this.node).delay(this.showTime).call(()=>{
+            this.node.scale = 0;
+            this.node.active = true;
+        }).to(0.1, {scale: 1}, cc.easeSineOut()).start();
     }
 
     public clickHeadPhotoBtn()

assets/script/game/module/redBagTask/RedBagTask.ts

@@ -16,6 +16,9 @@ export default class RedBagTask extends cc.Component{
     @property({displayName: '任务进度文本', type: cc.Label})
     private lbl_taskProgress: cc.Label = null;
 
+    @property({displayName: '按钮动画', type: cc.Animation})
+    private openBtn_ani: cc.Animation = null;
+
     @property(cc.Label)
     private lbl_reward_value: cc.Label = null;
     @property(cc.Sprite)
@@ -44,7 +47,7 @@ export default class RedBagTask extends cc.Component{
 
     private initTaskProgressUI()
     {
-        cc.tween(this.sp_taskProgress).to(0.2, {fillRange: 0.4}, {onUpdate: ()=>{
+        cc.tween(this.sp_taskProgress).delay(0.2).to(0.3, {fillRange: 0.4}, {onUpdate: ()=>{
             let str = this.sp_taskProgress.fillRange * 100;
             this.lbl_taskProgress.string = str.toFixed(0) + "%";
         }}).start();