future 1 år sedan
förälder
incheckning
0dd3e5d896

+ 11 - 11
assets/resources/ui/sign_reward_alone_item.prefab

@@ -164,8 +164,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -88.449,
-      "y": 106.377,
+      "x": -115.449,
+      "y": 104.377,
       "z": 0
     },
     "_lrot": {
@@ -323,8 +323,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -15.954999999999998,
-      "y": 113.415,
+      "x": -42.955,
+      "y": 111.415,
       "z": 0
     },
     "_lrot": {
@@ -1339,8 +1339,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 364,
-      "height": 290
+      "width": 353,
+      "height": 276
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1376,7 +1376,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "dea3dcc0-d26a-425b-a2a0-cda6262c5974@f9941",
+      "__uuid__": "e03d988b-774b-459b-9a70-a9f4a3faa544@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -1412,10 +1412,10 @@
     },
     "_alignFlags": 45,
     "_target": null,
-    "_left": 28,
-    "_right": 8,
-    "_top": 40,
-    "_bottom": 5,
+    "_left": 33.5,
+    "_right": 13.5,
+    "_top": 47,
+    "_bottom": 12,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,

+ 9 - 9
assets/resources/ui/sign_reward_item.prefab

@@ -165,7 +165,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -29.449,
-      "y": 106.377,
+      "y": 100.377,
       "z": 0
     },
     "_lrot": {
@@ -324,7 +324,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 43.045,
-      "y": 113.415,
+      "y": 107.415,
       "z": 0
     },
     "_lrot": {
@@ -1163,7 +1163,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 10.5,
-      "y": -18,
+      "y": -17.5,
       "z": 0
     },
     "_lrot": {
@@ -1339,8 +1339,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 174,
-      "height": 287
+      "width": 164,
+      "height": 276
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1412,10 +1412,10 @@
     },
     "_alignFlags": 45,
     "_target": null,
-    "_left": 25,
-    "_right": 4,
-    "_top": 42,
-    "_bottom": 6,
+    "_left": 30,
+    "_right": 9,
+    "_top": 47,
+    "_bottom": 12,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,

+ 262 - 262
assets/resources/ui/sign_total_reward_item.prefab

@@ -22,10 +22,10 @@
         "__id__": 2
       },
       {
-        "__id__": 42
+        "__id__": 36
       },
       {
-        "__id__": 58
+        "__id__": 42
       }
     ],
     "_active": true,
@@ -89,30 +89,27 @@
       },
       {
         "__id__": 15
-      },
-      {
-        "__id__": 21
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 35
+        "__id__": 29
       },
       {
-        "__id__": 37
+        "__id__": 31
       },
       {
-        "__id__": 39
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 35
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 39,
+      "y": 48,
       "z": 0
     },
     "_lrot": {
@@ -430,165 +427,6 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
-  {
-    "__type__": "cc.Node",
-    "_name": "lab_name",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 2
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 16
-      },
-      {
-        "__id__": 18
-      }
-    ],
-    "_prefab": {
-      "__id__": 20
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": -0.469,
-      "y": 39,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 15
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 17
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 105,
-      "height": 30
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "d8M6PCIdFC7JRfUI8JfOGJ"
-  },
-  {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 15
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 19
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 31,
-      "g": 81,
-      "b": 174,
-      "a": 255
-    },
-    "_string": "专属碎片",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 24,
-    "_fontSize": 24,
-    "_fontFamily": "Arial",
-    "_lineHeight": 24,
-    "_overflow": 1,
-    "_enableWrapText": false,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": true,
-    "_isBold": true,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": false,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_shadowOffset": {
-      "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
-    },
-    "_shadowBlur": 2,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "5f3IFkLt9GpK0BjEoTwpKo"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "beyKN/odpInoNeOqrcQ4bq",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
   {
     "__type__": "cc.Node",
     "_name": "img_mask",
@@ -599,23 +437,23 @@
     },
     "_children": [
       {
-        "__id__": 22
+        "__id__": 16
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 22
       },
       {
-        "__id__": 30
+        "__id__": 24
       },
       {
-        "__id__": 32
+        "__id__": 26
       }
     ],
     "_prefab": {
-      "__id__": 34
+      "__id__": 28
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -652,20 +490,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 21
+      "__id__": 15
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 23
+        "__id__": 17
       },
       {
-        "__id__": 25
+        "__id__": 19
       }
     ],
     "_prefab": {
-      "__id__": 27
+      "__id__": 21
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -702,11 +540,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 22
+      "__id__": 16
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 24
+      "__id__": 18
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -730,11 +568,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 22
+      "__id__": 16
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 26
+      "__id__": 20
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -788,16 +626,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 21
+      "__id__": 15
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 23
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 119,
-      "height": 119
+      "width": 112,
+      "height": 110
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -816,11 +654,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 21
+      "__id__": 15
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 31
+      "__id__": 25
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -861,11 +699,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 21
+      "__id__": 15
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 33
+      "__id__": 27
     },
     "_alignFlags": 45,
     "_target": null,
@@ -914,12 +752,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 36
+      "__id__": 30
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 119,
-      "height": 119
+      "width": 132,
+      "height": 130
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -942,7 +780,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 38
+      "__id__": 32
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -987,7 +825,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 40
+      "__id__": 34
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1046,6 +884,165 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "lab_name",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 37
+      },
+      {
+        "__id__": 39
+      }
+    ],
+    "_prefab": {
+      "__id__": 41
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -43.793,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 36
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 38
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 200,
+      "height": 30
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "d8M6PCIdFC7JRfUI8JfOGJ"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 36
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 40
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 31,
+      "g": 81,
+      "b": 174,
+      "a": 255
+    },
+    "_string": "专属碎片碎片片",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 25,
+    "_fontSize": 25,
+    "_fontFamily": "Arial",
+    "_lineHeight": 25,
+    "_overflow": 1,
+    "_enableWrapText": false,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": true,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_enableOutline": false,
+    "_outlineColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_outlineWidth": 2,
+    "_enableShadow": false,
+    "_shadowColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_shadowOffset": {
+      "__type__": "cc.Vec2",
+      "x": 2,
+      "y": 2
+    },
+    "_shadowBlur": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "5f3IFkLt9GpK0BjEoTwpKo"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "beyKN/odpInoNeOqrcQ4bq",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.Node",
     "_name": "Node",
@@ -1060,21 +1057,24 @@
       },
       {
         "__id__": 49
+      },
+      {
+        "__id__": 55
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 55
+        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 57
+      "__id__": 69
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -79,
+      "y": -100,
       "z": 0
     },
     "_lrot": {
@@ -1372,76 +1372,35 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 42
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 56
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 200,
-      "height": 50
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "3bMMhLEP1C4IOAOxo5DE35"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "869iGSzzRPnZsT41izDupb",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
   {
     "__type__": "cc.Node",
     "_name": "img_dot",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 1
+      "__id__": 42
     },
     "_children": [
       {
-        "__id__": 59
+        "__id__": 56
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 65
+        "__id__": 62
       },
       {
-        "__id__": 67
+        "__id__": 64
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 66
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -79,
+      "y": 0,
       "z": 0
     },
     "_lrot": {
@@ -1473,20 +1432,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 58
+      "__id__": 55
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 60
+        "__id__": 57
       },
       {
-        "__id__": 62
+        "__id__": 59
       }
     ],
     "_prefab": {
-      "__id__": 64
+      "__id__": 61
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1523,11 +1482,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 56
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 61
+      "__id__": 58
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1551,11 +1510,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 56
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 63
+      "__id__": 60
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1632,11 +1591,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 55
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 66
+      "__id__": 63
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1660,11 +1619,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 55
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 68
+      "__id__": 65
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1712,6 +1671,47 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 42
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 68
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 200,
+      "height": 50
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "3bMMhLEP1C4IOAOxo5DE35"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "869iGSzzRPnZsT41izDupb",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -1727,7 +1727,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 200,
-      "height": 210
+      "height": 250
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1807,16 +1807,16 @@
       "__id__": 9
     },
     "lab_name": {
-      "__id__": 15
+      "__id__": 36
     },
     "img_mask": {
-      "__id__": 21
+      "__id__": 15
     },
     "img_dot": {
-      "__id__": 58
+      "__id__": 55
     },
     "lab_days": {
-      "__id__": 59
+      "__id__": 56
     },
     "img_left_line": {
       "__id__": 43

+ 46 - 46
assets/resources/ui/sign_view.prefab

@@ -152,7 +152,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -367,7 +367,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 735,
+      "y": 756,
       "z": 0
     },
     "_lrot": {
@@ -1178,7 +1178,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -54,
+      "y": -40,
       "z": 0
     },
     "_lrot": {
@@ -4439,7 +4439,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4489,7 +4489,7 @@
     "fileId": "64YfhoTgBFCbpNoa3olZFn"
   },
   {
-    "__type__": "cc.Animation",
+    "__type__": "ff304qJj7xHWrrYd2Tqcj/E",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -4500,25 +4500,40 @@
     "__prefab": {
       "__id__": 195
     },
-    "playOnLoad": false,
-    "_clips": [
-      {
-        "__uuid__": "2a290986-2f60-4b6c-a9aa-c8dbef477bc7",
-        "__expectedType__": "cc.AnimationClip"
-      }
-    ],
-    "_defaultClip": {
-      "__uuid__": "2a290986-2f60-4b6c-a9aa-c8dbef477bc7",
-      "__expectedType__": "cc.AnimationClip"
+    "public_bg": {
+      "__id__": 2
+    },
+    "reward_node": {
+      "__id__": 19
+    },
+    "total_reward_node": {
+      "__id__": 41
+    },
+    "btn_sign": {
+      "__id__": 61
+    },
+    "lab_sign": {
+      "__id__": 62
+    },
+    "sf_btn_sign_qd": {
+      "__uuid__": "cc6a53f2-40f0-44c1-8f30-a2f14e9bcf66@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "sf_btn_sign_yqd": {
+      "__uuid__": "e5e2389c-2286-4e50-ab79-96d9f632c7ac@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "receive_reward": {
+      "__id__": 88
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "fb+i6YYblEW7KkpqH/rjJi"
+    "fileId": "96o5Na6oRFB4/y1V4cWXiS"
   },
   {
-    "__type__": "cc.BlockInputEvents",
+    "__type__": "cc.Animation",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -4529,14 +4544,25 @@
     "__prefab": {
       "__id__": 197
     },
+    "playOnLoad": true,
+    "_clips": [
+      {
+        "__uuid__": "2a290986-2f60-4b6c-a9aa-c8dbef477bc7",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": {
+      "__uuid__": "2a290986-2f60-4b6c-a9aa-c8dbef477bc7",
+      "__expectedType__": "cc.AnimationClip"
+    },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "c6w9g/M5BBRqFtIWl1EiUV"
+    "fileId": "fb+i6YYblEW7KkpqH/rjJi"
   },
   {
-    "__type__": "ff304qJj7xHWrrYd2Tqcj/E",
+    "__type__": "cc.BlockInputEvents",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -4547,37 +4573,11 @@
     "__prefab": {
       "__id__": 199
     },
-    "public_bg": {
-      "__id__": 2
-    },
-    "reward_node": {
-      "__id__": 19
-    },
-    "total_reward_node": {
-      "__id__": 41
-    },
-    "btn_sign": {
-      "__id__": 61
-    },
-    "lab_sign": {
-      "__id__": 62
-    },
-    "sf_btn_sign_qd": {
-      "__uuid__": "cc6a53f2-40f0-44c1-8f30-a2f14e9bcf66@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "sf_btn_sign_yqd": {
-      "__uuid__": "e5e2389c-2286-4e50-ab79-96d9f632c7ac@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "receive_reward": {
-      "__id__": 88
-    },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "96o5Na6oRFB4/y1V4cWXiS"
+    "fileId": "c6w9g/M5BBRqFtIWl1EiUV"
   },
   {
     "__type__": "cc.PrefabInfo",

+ 2 - 0
assets/script/ui/mailbox_view/mailbox_view.ts

@@ -55,6 +55,8 @@ export class mailbox_view extends base_ui {
         })
         this.content_scrollView.on(ScrollView.EventType.SCROLL_TO_BOTTOM, this.onScrollToBottom, this)
 
+        this.content_bg.active = false
+        this.img_empty.active = false
         this.requestListData(false)
     }
 

+ 1 - 1
assets/script/ui/sign_view/sign_total_reward.ts

@@ -16,7 +16,7 @@ export class sign_total_reward extends Component {
 
     initView(data_list:sign_total_reward_data[], cb) {
         this.m_cb = cb
-        
+        console.log('total_reward_list=',data_list)
         this.content.removeAllChildren()
         for (let index = 0; index < data_list.length; index++) {
             const element = data_list[index];

+ 6 - 4
assets/script/ui/sign_view/sign_total_reward_item.ts

@@ -53,22 +53,24 @@ export class sign_total_reward_item extends base_ui {
 
         if(data.receive_status==1) {
             // 已经领取
-            this.img_mask.active = true
             this.setState(false)
+            this.img_mask.active = true
+            this.img_bg.getComponent(Sprite).spriteFrame = this.sf_item_default
         } else{
             // 未领取
             this.img_mask.active = false
             if(data.is_receive_status==1) {
                 // 可以领取 
                 this.setState(false)
-                if(data.temp_is_last_receive==true) {
-                    this.img_right_line.getComponent(Sprite).spriteFrame = this.sf_line_default
-                }
             } else {
                 // 不能领取 
                 this.setState(true)
             }
         }
+
+        if(data.temp_is_last_receive==true) {
+            this.img_right_line.getComponent(Sprite).spriteFrame = this.sf_line_default
+        }
     }
 
     private setState(is_default:boolean) {

BIN
assets/texture/ui/sign_view/sign_item_mask_1_1.png


+ 134 - 0
assets/texture/ui/sign_view/sign_item_mask_1_1.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "e03d988b-774b-459b-9a70-a9f4a3faa544",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "e03d988b-774b-459b-9a70-a9f4a3faa544@6c48a",
+      "displayName": "sign_item_mask_1_1",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "e03d988b-774b-459b-9a70-a9f4a3faa544",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "e03d988b-774b-459b-9a70-a9f4a3faa544@f9941",
+      "displayName": "sign_item_mask_1_1",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 353,
+        "height": 275,
+        "rawWidth": 353,
+        "rawHeight": 275,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -176.5,
+            -137.5,
+            0,
+            176.5,
+            -137.5,
+            0,
+            -176.5,
+            137.5,
+            0,
+            176.5,
+            137.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            275,
+            353,
+            275,
+            0,
+            0,
+            353,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -176.5,
+            -137.5,
+            0
+          ],
+          "maxPos": [
+            176.5,
+            137.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "e03d988b-774b-459b-9a70-a9f4a3faa544@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "e03d988b-774b-459b-9a70-a9f4a3faa544@f9941"
+  }
+}

BIN
assets/texture/ui/sign_view/sign_item_mask_2.png


+ 20 - 20
assets/texture/ui/sign_view/sign_item_mask_2.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 119,
-        "height": 119,
-        "rawWidth": 119,
-        "rawHeight": 119,
+        "width": 132,
+        "height": 130,
+        "rawWidth": 132,
+        "rawHeight": 130,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -59.5,
-            -59.5,
+            -66,
+            -65,
             0,
-            59.5,
-            -59.5,
+            66,
+            -65,
             0,
-            -59.5,
-            59.5,
+            -66,
+            65,
             0,
-            59.5,
-            59.5,
+            66,
+            65,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            119,
-            119,
-            119,
+            130,
+            132,
+            130,
             0,
             0,
-            119,
+            132,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -59.5,
-            -59.5,
+            -66,
+            -65,
             0
           ],
           "maxPos": [
-            59.5,
-            59.5,
+            66,
+            65,
             0
           ]
         },

BIN
assets/texture/ui/sign_view/sign_total_reward_item_1.png


+ 20 - 20
assets/texture/ui/sign_view/sign_total_reward_item_1.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 119,
-        "height": 119,
-        "rawWidth": 119,
-        "rawHeight": 119,
+        "width": 132,
+        "height": 130,
+        "rawWidth": 132,
+        "rawHeight": 130,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -59.5,
-            -59.5,
+            -66,
+            -65,
             0,
-            59.5,
-            -59.5,
+            66,
+            -65,
             0,
-            -59.5,
-            59.5,
+            -66,
+            65,
             0,
-            59.5,
-            59.5,
+            66,
+            65,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            119,
-            119,
-            119,
+            130,
+            132,
+            130,
             0,
             0,
-            119,
+            132,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -59.5,
-            -59.5,
+            -66,
+            -65,
             0
           ],
           "maxPos": [
-            59.5,
-            59.5,
+            66,
+            65,
             0
           ]
         },

BIN
assets/texture/ui/sign_view/sign_total_reward_item_2.png


+ 20 - 20
assets/texture/ui/sign_view/sign_total_reward_item_2.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 143,
-        "height": 143,
-        "rawWidth": 143,
-        "rawHeight": 143,
+        "width": 154,
+        "height": 154,
+        "rawWidth": 154,
+        "rawHeight": 154,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -71.5,
-            -71.5,
+            -77,
+            -77,
             0,
-            71.5,
-            -71.5,
+            77,
+            -77,
             0,
-            -71.5,
-            71.5,
+            -77,
+            77,
             0,
-            71.5,
-            71.5,
+            77,
+            77,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            143,
-            143,
-            143,
+            154,
+            154,
+            154,
             0,
             0,
-            143,
+            154,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -71.5,
-            -71.5,
+            -77,
+            -77,
             0
           ],
           "maxPos": [
-            71.5,
-            71.5,
+            77,
+            77,
             0
           ]
         },