wuwangdong 4 years ago
parent
commit
4705d3e29f

File diff suppressed because it is too large
+ 200 - 424
assets/resources/game/prefab/game.prefab


+ 42 - 11
assets/resources/module/inviteFriends/inviteFriends.prefab

@@ -24,9 +24,6 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 243
-      },
-      {
         "__id__": 244
       },
       {
@@ -34,10 +31,13 @@
       },
       {
         "__id__": 246
+      },
+      {
+        "__id__": 247
       }
     ],
     "_prefab": {
-      "__id__": 247
+      "__id__": 248
     },
     "_opacity": 255,
     "_color": {
@@ -99,9 +99,13 @@
       }
     ],
     "_active": true,
-    "_components": [],
+    "_components": [
+      {
+        "__id__": 242
+      }
+    ],
     "_prefab": {
-      "__id__": 242
+      "__id__": 243
     },
     "_opacity": 255,
     "_color": {
@@ -113,8 +117,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 0,
-      "height": 0
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3192,7 +3196,7 @@
     "asset": {
       "__uuid__": "f46c1667-e4ec-4998-8667-1e92c612ee2a"
     },
-    "fileId": "23LQmudPxLfK75ZtNj79Xl",
+    "fileId": "cbaH3WxvpJ06iFzpGiJSga",
     "sync": false
   },
   {
@@ -3322,7 +3326,7 @@
     "asset": {
       "__uuid__": "f46c1667-e4ec-4998-8667-1e92c612ee2a"
     },
-    "fileId": "f7QAq5BYxN+Ljff7akb03s",
+    "fileId": "cbtIRLTp9FW4sp/YT0hdQa",
     "sync": false
   },
   {
@@ -3452,7 +3456,7 @@
     "asset": {
       "__uuid__": "f46c1667-e4ec-4998-8667-1e92c612ee2a"
     },
-    "fileId": "42/AJTKcZPFbedehJ906cu",
+    "fileId": "8eFP7zuONFp6daKIdQ7Lfj",
     "sync": false
   },
   {
@@ -8478,6 +8482,33 @@
     "sync": false
   },
   {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 45,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 750,
+    "_originalHeight": 1334,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

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

@@ -2003,7 +2003,7 @@
     "node": {
       "__id__": 34
     },
-    "_enabled": true,
+    "_enabled": false,
     "_layoutSize": {
       "__type__": "cc.Size",
       "width": 200,

+ 46 - 16
assets/resources/module/redBagTask/redBagTask.prefab

@@ -24,9 +24,6 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 111
-      },
-      {
         "__id__": 112
       },
       {
@@ -34,10 +31,13 @@
       },
       {
         "__id__": 114
+      },
+      {
+        "__id__": 115
       }
     ],
     "_prefab": {
-      "__id__": 115
+      "__id__": 116
     },
     "_opacity": 255,
     "_color": {
@@ -101,7 +101,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 110
+      "__id__": 111
     },
     "_opacity": 255,
     "_color": {
@@ -181,10 +181,13 @@
     "_components": [
       {
         "__id__": 108
+      },
+      {
+        "__id__": 109
       }
     ],
     "_prefab": {
-      "__id__": 109
+      "__id__": 110
     },
     "_opacity": 255,
     "_color": {
@@ -197,7 +200,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 610,
-      "height": 777
+      "height": 777.0000000000003
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -209,7 +212,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        191.04,
+        113.74799999999999,
         0,
         0,
         0,
@@ -1425,7 +1428,7 @@
     "node": {
       "__id__": 18
     },
-    "_enabled": true,
+    "_enabled": false,
     "_layoutSize": {
       "__type__": "cc.Size",
       "width": 200,
@@ -2819,7 +2822,7 @@
     "asset": {
       "__uuid__": "82a16e23-7ade-43a5-af4f-5504bb39b61f"
     },
-    "fileId": "630wbqiu9J4L8Atq30CvBi",
+    "fileId": "c3fAabojRD3YAUIXl82wa9",
     "sync": false
   },
   {
@@ -2928,7 +2931,7 @@
     "asset": {
       "__uuid__": "82a16e23-7ade-43a5-af4f-5504bb39b61f"
     },
-    "fileId": "b3/28Z0w1Hgp2QAYJ2pZ6M",
+    "fileId": "e0nyX6inNKhKo6KRY/DQsk",
     "sync": false
   },
   {
@@ -3037,7 +3040,7 @@
     "asset": {
       "__uuid__": "82a16e23-7ade-43a5-af4f-5504bb39b61f"
     },
-    "fileId": "2agMyQvZtIN4B1LSc5hM5t",
+    "fileId": "e8D9vUi8JBw5u5t2ShwqGI",
     "sync": false
   },
   {
@@ -3146,7 +3149,7 @@
     "asset": {
       "__uuid__": "82a16e23-7ade-43a5-af4f-5504bb39b61f"
     },
-    "fileId": "1d3SehaglJ0KhUOxpcJQ6U",
+    "fileId": "carWyPlHlEKpzHjqRigLJ1",
     "sync": false
   },
   {
@@ -3571,7 +3574,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 58,
+      "width": 70,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -3625,7 +3628,7 @@
     "_dstBlendFactor": 771,
     "_string": "加进度",
     "_N$string": "加进度",
-    "_fontSize": 18,
+    "_fontSize": 22,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -3893,7 +3896,7 @@
       "__uuid__": "d6b388b3-3e0c-4ca2-9e6b-abbd2f1eea44"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -3907,6 +3910,33 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 45,
+    "_left": -305,
+    "_right": -305,
+    "_top": -502.24800000000016,
+    "_bottom": -274.7520000000002,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 610,
+    "_originalHeight": 777,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

+ 190 - 115
assets/resources/module/sign/sign.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 49
+        "__id__": 51
       },
       {
-        "__id__": 50
+        "__id__": 52
       },
       {
-        "__id__": 51
+        "__id__": 53
       },
       {
-        "__id__": 53
+        "__id__": 55
       }
     ],
     "_prefab": {
-      "__id__": 54
+      "__id__": 56
     },
     "_opacity": 255,
     "_color": {
@@ -62,7 +62,7 @@
       "ctor": "Float64Array",
       "array": [
         375,
-        684.288,
+        667,
         0,
         0,
         0,
@@ -96,32 +96,96 @@
     "_children": [
       {
         "__id__": 3
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 49
+      }
+    ],
+    "_prefab": {
+      "__id__": 50
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 750,
+      "height": 1334
+    },
+    "_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": "New Node",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [
+      {
+        "__id__": 4
       },
       {
-        "__id__": 6
+        "__id__": 7
       },
       {
-        "__id__": 15
+        "__id__": 16
       },
       {
-        "__id__": 21
+        "__id__": 22
       },
       {
-        "__id__": 24
+        "__id__": 25
       },
       {
-        "__id__": 27
+        "__id__": 28
       },
       {
-        "__id__": 41
+        "__id__": 42
       }
     ],
     "_active": true,
-    "_components": [
-      {
-        "__id__": 47
-      }
-    ],
+    "_components": [],
     "_prefab": {
       "__id__": 48
     },
@@ -154,8 +218,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         1
       ]
     },
@@ -177,17 +241,17 @@
     "_name": "背景板",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 4
+        "__id__": 5
       }
     ],
     "_prefab": {
-      "__id__": 5
+      "__id__": 6
     },
     "_opacity": 255,
     "_color": {
@@ -241,7 +305,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 3
+      "__id__": 4
     },
     "_enabled": true,
     "_materials": [
@@ -276,7 +340,7 @@
     "asset": {
       "__uuid__": "336fd143-f8e6-438c-bc88-e4fdf40e9791"
     },
-    "fileId": "beueVIB7RHDq869+Lq2loa",
+    "fileId": "0cEmRucbJGCr8iWOMsjx9T",
     "sync": false
   },
   {
@@ -284,24 +348,24 @@
     "_name": "滚动视图",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [
       {
-        "__id__": 7
+        "__id__": 8
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 12
+        "__id__": 13
       },
       {
-        "__id__": 13
+        "__id__": 14
       }
     ],
     "_prefab": {
-      "__id__": 14
+      "__id__": 15
     },
     "_opacity": 255,
     "_color": {
@@ -355,21 +419,21 @@
     "_name": "view",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 6
+      "__id__": 7
     },
     "_children": [
       {
-        "__id__": 8
+        "__id__": 9
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 10
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 11
+      "__id__": 12
     },
     "_opacity": 255,
     "_color": {
@@ -394,7 +458,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        2.842170943040401e-14,
         0,
         0,
         0,
@@ -423,13 +487,13 @@
     "_name": "content",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 7
+      "__id__": 8
     },
     "_children": [],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 9
+      "__id__": 10
     },
     "_opacity": 255,
     "_color": {
@@ -486,7 +550,7 @@
     "asset": {
       "__uuid__": "336fd143-f8e6-438c-bc88-e4fdf40e9791"
     },
-    "fileId": "3ftrRQebdDMLvxRZUU5HN8",
+    "fileId": "20LFcubXlBkbkhfUpiRRlU",
     "sync": false
   },
   {
@@ -494,7 +558,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 7
+      "__id__": 8
     },
     "_enabled": true,
     "_materials": [
@@ -517,7 +581,7 @@
     "asset": {
       "__uuid__": "336fd143-f8e6-438c-bc88-e4fdf40e9791"
     },
-    "fileId": "f6gBdRJjtNQYP3ruhe0IF2",
+    "fileId": "d1bT500wFC8rv3u6fgZVXS",
     "sync": false
   },
   {
@@ -525,7 +589,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 6
+      "__id__": 7
     },
     "_enabled": true,
     "horizontal": false,
@@ -537,10 +601,10 @@
     "scrollEvents": [],
     "cancelInnerEvents": false,
     "_N$content": {
-      "__id__": 8
+      "__id__": 9
     },
     "content": {
-      "__id__": 8
+      "__id__": 9
     },
     "_N$horizontalScrollBar": null,
     "_N$verticalScrollBar": null,
@@ -551,7 +615,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 6
+      "__id__": 7
     },
     "_enabled": true,
     "pre_item": [
@@ -575,7 +639,7 @@
     "asset": {
       "__uuid__": "336fd143-f8e6-438c-bc88-e4fdf40e9791"
     },
-    "fileId": "fbD7KlDfhIoYMGJW1LVslM",
+    "fileId": "46/V+N56JJComl93uu1U3J",
     "sync": false
   },
   {
@@ -583,21 +647,21 @@
     "_name": "标题版",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [
       {
-        "__id__": 16
+        "__id__": 17
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 20
+      "__id__": 21
     },
     "_opacity": 255,
     "_color": {
@@ -651,17 +715,17 @@
     "_name": "标题",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 15
+      "__id__": 16
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 17
+        "__id__": 18
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 19
     },
     "_opacity": 255,
     "_color": {
@@ -686,7 +750,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        12.524,
+        12.524000000000115,
         0,
         0,
         0,
@@ -715,7 +779,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 16
+      "__id__": 17
     },
     "_enabled": true,
     "_materials": [
@@ -750,7 +814,7 @@
     "asset": {
       "__uuid__": "336fd143-f8e6-438c-bc88-e4fdf40e9791"
     },
-    "fileId": "cdahULvRZN27nPtLFVKKh9",
+    "fileId": "41pRSAeOBIBIC2rgIhp9fW",
     "sync": false
   },
   {
@@ -758,7 +822,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 16
     },
     "_enabled": true,
     "_materials": [
@@ -793,7 +857,7 @@
     "asset": {
       "__uuid__": "336fd143-f8e6-438c-bc88-e4fdf40e9791"
     },
-    "fileId": "e3g7V5/+RN67+4qMmU8i5G",
+    "fileId": "b2yChuyA5J8IKg7tsWJJkw",
     "sync": false
   },
   {
@@ -801,17 +865,17 @@
     "_name": "熊猫",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 23
       }
     ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 24
     },
     "_opacity": 255,
     "_color": {
@@ -865,7 +929,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 21
+      "__id__": 22
     },
     "_enabled": true,
     "_materials": [
@@ -900,7 +964,7 @@
     "asset": {
       "__uuid__": "336fd143-f8e6-438c-bc88-e4fdf40e9791"
     },
-    "fileId": "48/78AGXhG25RfH7wQMUxa",
+    "fileId": "34TjHmurVCtq7Y/abK23ou",
     "sync": false
   },
   {
@@ -908,17 +972,17 @@
     "_name": "熊猫",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 26
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 27
     },
     "_opacity": 255,
     "_color": {
@@ -951,7 +1015,7 @@
         1,
         0.4,
         0.4,
-        1
+        0.4
       ]
     },
     "_eulerAngles": {
@@ -972,7 +1036,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 25
     },
     "_enabled": true,
     "_materials": [
@@ -1017,7 +1081,7 @@
     "asset": {
       "__uuid__": "336fd143-f8e6-438c-bc88-e4fdf40e9791"
     },
-    "fileId": "e2EUqd0uNOtqjmnhosXrMU",
+    "fileId": "b4xXh4YL5FAoMVS9qv+8dC",
     "sync": false
   },
   {
@@ -1025,33 +1089,33 @@
     "_name": "按钮_签到",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [
       {
-        "__id__": 28
+        "__id__": 29
       },
       {
-        "__id__": 31
+        "__id__": 32
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 35
-      },
-      {
         "__id__": 36
       },
       {
         "__id__": 37
       },
       {
-        "__id__": 39
+        "__id__": 38
+      },
+      {
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 41
     },
     "_opacity": 255,
     "_color": {
@@ -1076,7 +1140,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -408.93800000000084,
+        -408.938,
         0,
         0,
         0,
@@ -1105,17 +1169,17 @@
     "_name": "视频图标",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 27
+      "__id__": 28
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 29
+        "__id__": 30
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 31
     },
     "_opacity": 255,
     "_color": {
@@ -1139,8 +1203,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -57.917,
-        9.088,
+        -57.917000000000016,
+        9.087999999999965,
         0,
         0,
         0,
@@ -1169,7 +1233,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 28
+      "__id__": 29
     },
     "_enabled": true,
     "_materials": [
@@ -1204,7 +1268,7 @@
     "asset": {
       "__uuid__": "336fd143-f8e6-438c-bc88-e4fdf40e9791"
     },
-    "fileId": "84brVkywNDVaLSA0QknbJM",
+    "fileId": "e5QJmDOSlCiK7ONecy1eZX",
     "sync": false
   },
   {
@@ -1212,20 +1276,20 @@
     "_name": "按钮描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 27
+      "__id__": 28
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 33
       },
       {
-        "__id__": 33
+        "__id__": 34
       }
     ],
     "_prefab": {
-      "__id__": 34
+      "__id__": 35
     },
     "_opacity": 255,
     "_color": {
@@ -1249,8 +1313,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        24.054,
-        9.088,
+        24.054000000000002,
+        9.087999999999965,
         0,
         0,
         0,
@@ -1279,7 +1343,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 31
+      "__id__": 32
     },
     "_enabled": true,
     "_materials": [
@@ -1314,7 +1378,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 31
+      "__id__": 32
     },
     "_enabled": true,
     "_color": {
@@ -1335,7 +1399,7 @@
     "asset": {
       "__uuid__": "336fd143-f8e6-438c-bc88-e4fdf40e9791"
     },
-    "fileId": "decGIMIDdAjqxTTzB3H1mk",
+    "fileId": "7aLy/cALhL9pzDxafu420a",
     "sync": false
   },
   {
@@ -1343,7 +1407,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 28
     },
     "_enabled": true,
     "_materials": [
@@ -1375,7 +1439,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 28
     },
     "_enabled": true,
     "_defaultClip": {
@@ -1394,7 +1458,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 28
     },
     "_enabled": true,
     "_normalMaterial": {
@@ -1407,7 +1471,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 38
+        "__id__": 39
       }
     ],
     "_N$interactable": true,
@@ -1463,7 +1527,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 27
+      "__id__": 28
     },
     "_id": ""
   },
@@ -1482,7 +1546,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 28
     },
     "_enabled": true,
     "normal": {
@@ -1502,7 +1566,7 @@
     "asset": {
       "__uuid__": "336fd143-f8e6-438c-bc88-e4fdf40e9791"
     },
-    "fileId": "e9mvSUMgNMQr5UQA6xbHF0",
+    "fileId": "1bzxBH8qREqbo4IMCtEJtA",
     "sync": false
   },
   {
@@ -1510,23 +1574,23 @@
     "_name": "关闭按钮",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 42
-      },
-      {
         "__id__": 43
       },
       {
         "__id__": 44
+      },
+      {
+        "__id__": 45
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 47
     },
     "_opacity": 255,
     "_color": {
@@ -1580,7 +1644,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 41
+      "__id__": 42
     },
     "_enabled": true,
     "_materials": [
@@ -1612,7 +1676,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 41
+      "__id__": 42
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1680,7 +1744,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 41
+      "__id__": 42
     },
     "_enabled": true,
     "node_panel": {
@@ -1689,7 +1753,7 @@
     "transition_type": 0,
     "onComplete": [
       {
-        "__id__": 45
+        "__id__": 46
       }
     ],
     "_id": ""
@@ -1712,7 +1776,18 @@
     "asset": {
       "__uuid__": "336fd143-f8e6-438c-bc88-e4fdf40e9791"
     },
-    "fileId": "c5iCojeNJMfbXzuRye1+kW",
+    "fileId": "14QSX8px1BtKPFOnAytr7H",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "336fd143-f8e6-438c-bc88-e4fdf40e9791"
+    },
+    "fileId": "2f0K0zYmNPg5m0kcA8Et8a",
     "sync": false
   },
   {
@@ -1766,8 +1841,8 @@
     "_alignFlags": 45,
     "_left": 0,
     "_right": 0,
-    "_top": -17.28800000000001,
-    "_bottom": 17.28800000000001,
+    "_top": 0,
+    "_bottom": 0,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
     "_isAbsLeft": true,
@@ -1789,10 +1864,10 @@
     },
     "_enabled": true,
     "scroll_view": {
-      "__id__": 12
+      "__id__": 13
     },
     "anim_btn": {
-      "__id__": 36
+      "__id__": 37
     },
     "_id": ""
   },
@@ -1812,12 +1887,12 @@
       "a": 230
     },
     "design_block_node": {
-      "__id__": 3
+      "__id__": 4
     },
     "bClickClose": true,
     "onComplete": [
       {
-        "__id__": 52
+        "__id__": 54
       }
     ],
     "_id": ""

+ 52 - 31
assets/resources/module/turnable/turnable.prefab

@@ -24,17 +24,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 132
-      },
-      {
         "__id__": 133
       },
       {
         "__id__": 134
+      },
+      {
+        "__id__": 135
       }
     ],
     "_prefab": {
-      "__id__": 135
+      "__id__": 136
     },
     "_opacity": 255,
     "_color": {
@@ -125,16 +125,16 @@
         "__id__": 87
       },
       {
-        "__id__": 124
+        "__id__": 125
       },
       {
-        "__id__": 127
+        "__id__": 128
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 131
+      "__id__": 132
     },
     "_opacity": 255,
     "_color": {
@@ -2210,7 +2210,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "37E303aIZCD5MjVXKJbFHz",
+    "fileId": "23e0X1+0lDB726E/t222Mp",
     "sync": false
   },
   {
@@ -2342,7 +2342,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "e5HPyOnXBD3KRD5X0Q2Lx/",
+    "fileId": "4duaaFT0FJQJUMCTP8js9U",
     "sync": false
   },
   {
@@ -2474,7 +2474,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "3bQwmwDxNKebCuyaaCnci4",
+    "fileId": "41VGHczUVOKYmFju8NpHTc",
     "sync": false
   },
   {
@@ -2690,7 +2690,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "baO0Ktc+9JbrEOzkTIhTXb",
+    "fileId": "b1dYYCTiRAbpv41wpCoJH6",
     "sync": false
   },
   {
@@ -2801,7 +2801,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "48NDMlQjhJv5yw4JXUUYIg",
+    "fileId": "58c29uD2pGTr1l3KRkIOAl",
     "sync": false
   },
   {
@@ -2925,7 +2925,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -634.69,
+        -602.69,
         0,
         0,
         0,
@@ -3057,7 +3057,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "42DKhURRpPg7hZFzc3IcAs",
+    "fileId": "19mU3q8WFKiZMkVcXR9jZy",
     "sync": false
   },
   {
@@ -3115,11 +3115,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 121
+        "__id__": 122
       }
     ],
     "_prefab": {
-      "__id__": 123
+      "__id__": 124
     },
     "_opacity": 255,
     "_color": {
@@ -3492,7 +3492,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        3,
         0,
         0,
         0,
@@ -3894,7 +3894,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        3,
         0,
         0,
         0,
@@ -3991,9 +3991,13 @@
       }
     ],
     "_active": false,
-    "_components": [],
+    "_components": [
+      {
+        "__id__": 120
+      }
+    ],
     "_prefab": {
-      "__id__": 120
+      "__id__": 121
     },
     "_opacity": 255,
     "_color": {
@@ -4296,7 +4300,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        3,
         0,
         0,
         0,
@@ -4364,6 +4368,23 @@
     "sync": false
   },
   {
+    "__type__": "f67a9SEPlBL8rHHpVX6g1ZW",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 110
+    },
+    "_enabled": true,
+    "normal": {
+      "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+    },
+    "gray": {
+      "__uuid__": "3a7bb79f-32fd-422e-ada2-96f518fed422"
+    },
+    "grayState": true,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -4393,7 +4414,7 @@
     },
     "onClick": [
       {
-        "__id__": 122
+        "__id__": 123
       }
     ],
     "_id": ""
@@ -4430,11 +4451,11 @@
     "_active": false,
     "_components": [
       {
-        "__id__": 125
+        "__id__": 126
       }
     ],
     "_prefab": {
-      "__id__": 126
+      "__id__": 127
     },
     "_opacity": 255,
     "_color": {
@@ -4488,7 +4509,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 124
+      "__id__": 125
     },
     "_enabled": true,
     "_materials": [
@@ -4547,14 +4568,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 128
+        "__id__": 129
       },
       {
-        "__id__": 129
+        "__id__": 130
       }
     ],
     "_prefab": {
-      "__id__": 130
+      "__id__": 131
     },
     "_opacity": 255,
     "_color": {
@@ -4608,7 +4629,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 127
+      "__id__": 128
     },
     "_enabled": true,
     "_materials": [
@@ -4640,7 +4661,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 127
+      "__id__": 128
     },
     "_enabled": true,
     "panel_name": "module/turnable/turnablerule",
@@ -4716,7 +4737,7 @@
       "__id__": 12
     },
     "baozhaAni": {
-      "__id__": 125
+      "__id__": 126
     },
     "lbl_probability": {
       "__id__": 77

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